Skip to content
This repository was archived by the owner on Apr 24, 2025. It is now read-only.

Commit 16c315b

Browse files
Polishes version updates (#280)
Signed-off-by: Adrian Cole <[email protected]>
1 parent 998ed3c commit 16c315b

File tree

7 files changed

+26
-27
lines changed

7 files changed

+26
-27
lines changed

.github/workflows/push-wasm-images.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: install Go
13-
uses: actions/setup-go@v2
13+
uses: actions/setup-go@v3
1414
with:
15-
go-version: '1.18'
15+
go-version: '1.18.1'
1616

1717
- name: Install TinyGo
1818
run: |
@@ -26,7 +26,7 @@ jobs:
2626
run: make build.examples
2727

2828
- name: Login to GitHub Container Registry
29-
uses: docker/login-action@v1
29+
uses: docker/login-action@v2
3030
with:
3131
registry: ghcr.io
3232
username: ${{ github.repository_owner }}

.github/workflows/workflow.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: install Go
16-
uses: actions/setup-go@v2
16+
uses: actions/setup-go@v3
1717
with:
18-
go-version: '1.18'
18+
go-version: '1.18.1'
1919

2020
- name: checkout
2121
uses: actions/checkout@v3
@@ -31,9 +31,9 @@ jobs:
3131
runs-on: ubuntu-latest
3232
steps:
3333
- name: install Go
34-
uses: actions/setup-go@v2
34+
uses: actions/setup-go@v3
3535
with:
36-
go-version: '1.18'
36+
go-version: '1.18.1'
3737

3838
- name: checkout
3939
uses: actions/checkout@v3
@@ -59,9 +59,9 @@ jobs:
5959

6060
- name: Install Go
6161
if: steps.cache-built-examples.outputs.cache-hit != 'true'
62-
uses: actions/setup-go@v2
62+
uses: actions/setup-go@v3
6363
with:
64-
go-version: '1.18'
64+
go-version: '1.18.1'
6565

6666
# TinyGo's release container does not have Make command.
6767
- name: Install Make
@@ -94,9 +94,9 @@ jobs:
9494
options: --privileged
9595
steps:
9696
- name: Install Go
97-
uses: actions/setup-go@v2
97+
uses: actions/setup-go@v3
9898
with:
99-
go-version: '1.18'
99+
go-version: '1.18.1'
100100

101101
- name: Print Envoy version
102102
run: envoy --version

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
goimports := golang.org/x/tools/cmd/[email protected].5
2-
golangci_lint := github.com/golangci/golangci-lint/cmd/golangci-lint@v1.42.0
1+
goimports := golang.org/x/tools/cmd/[email protected].10
2+
golangci_lint := github.com/golangci/golangci-lint/cmd/golangci-lint@v1.45.2
33

44
.PHONY: build.example
55
build.example:
@@ -15,27 +15,27 @@ build.examples:
1515

1616
.PHONY: test
1717
test:
18-
# First we test the main module because the iteration through the modules
19-
# in the lines above is very inconvenient when the folder is ".".
20-
go test -tags=proxytest $(shell go list ./... | grep -v e2e)
18+
@# First we test the main module because the iteration through the modules
19+
@# in the lines above is very inconvenient when the folder is ".".
20+
@go test -tags=proxytest $(shell go list ./... | grep -v e2e)
2121

22-
# Now we go through the examples.
22+
@# Now we go through the examples.
2323
@find . -name "go.mod" \
2424
| grep -v "\.\/go\.mod" \
2525
| xargs -I {} bash -c 'dirname {}' \
2626
| xargs -I {} bash -c 'cd {}; go test -tags=proxytest ./...'
2727

2828
.PHONY: test.e2e
2929
test.e2e:
30-
go test -v ./e2e -count=1
30+
@go test -v ./e2e -count=1
3131

3232
.PHONY: test.e2e.single
3333
test.e2e.single:
34-
go test -v ./e2e -run '/${name}' -count=1
34+
@go test -v ./e2e -run '/${name}' -count=1
3535

3636
.PHONY: run
3737
run:
38-
envoy -c ./examples/${name}/envoy.yaml --concurrency 2 --log-format '%v'
38+
@envoy -c ./examples/${name}/envoy.yaml --concurrency 2 --log-format '%v'
3939

4040
.PHONY: lint
4141
lint:

examples/json_validation/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ replace github.com/tetratelabs/proxy-wasm-go-sdk => ../..
77
require (
88
github.com/stretchr/testify v1.7.1
99
github.com/tetratelabs/proxy-wasm-go-sdk v0.16.0
10-
github.com/tidwall/gjson v1.14.0
10+
github.com/tidwall/gjson v1.14.1
1111
)
1212

1313
require (

examples/json_validation/go.sum

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
44
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
55
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
66
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
7-
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
87
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
98
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
10-
github.com/tidwall/gjson v1.14.0 h1:6aeJ0bzojgWLa82gDQHcx3S0Lr/O51I9bJ5nv6JFx5w=
11-
github.com/tidwall/gjson v1.14.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
9+
github.com/tidwall/gjson v1.14.1 h1:iymTbGkQBhveq21bEvAQ81I0LEBork8BFe1CUZXdyuo=
10+
github.com/tidwall/gjson v1.14.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
1211
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
1312
github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
1413
github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/tetratelabs/proxy-wasm-go-sdk
22

33
go 1.17
44

5-
require github.com/stretchr/testify v1.7.0
5+
require github.com/stretchr/testify v1.7.1
66

77
require (
88
github.com/davecgh/go-spew v1.1.1 // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
44
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
55
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
66
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
7-
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
8-
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
7+
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
8+
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
99
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
1010
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
1111
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)