Skip to content
This repository has been archived by the owner on Jul 28, 2024. It is now read-only.

Commit

Permalink
Polishes version updates (#280)
Browse files Browse the repository at this point in the history
Signed-off-by: Adrian Cole <[email protected]>
  • Loading branch information
codefromthecrypt authored May 8, 2022
1 parent 998ed3c commit 16c315b
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 27 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/push-wasm-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: install Go
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: '1.18'
go-version: '1.18.1'

- name: Install TinyGo
run: |
Expand All @@ -26,7 +26,7 @@ jobs:
run: make build.examples

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: install Go
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: '1.18'
go-version: '1.18.1'

- name: checkout
uses: actions/checkout@v3
Expand All @@ -31,9 +31,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: install Go
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: '1.18'
go-version: '1.18.1'

- name: checkout
uses: actions/checkout@v3
Expand All @@ -59,9 +59,9 @@ jobs:

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

# TinyGo's release container does not have Make command.
- name: Install Make
Expand Down Expand Up @@ -94,9 +94,9 @@ jobs:
options: --privileged
steps:
- name: Install Go
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: '1.18'
go-version: '1.18.1'

- name: Print Envoy version
run: envoy --version
Expand Down
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
goimports := golang.org/x/tools/cmd/[email protected].5
golangci_lint := github.com/golangci/golangci-lint/cmd/golangci-lint@v1.42.0
goimports := golang.org/x/tools/cmd/[email protected].10
golangci_lint := github.com/golangci/golangci-lint/cmd/golangci-lint@v1.45.2

.PHONY: build.example
build.example:
Expand All @@ -15,27 +15,27 @@ build.examples:

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

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

.PHONY: test.e2e
test.e2e:
go test -v ./e2e -count=1
@go test -v ./e2e -count=1

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

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

.PHONY: lint
lint:
Expand Down
2 changes: 1 addition & 1 deletion examples/json_validation/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ replace github.com/tetratelabs/proxy-wasm-go-sdk => ../..
require (
github.com/stretchr/testify v1.7.1
github.com/tetratelabs/proxy-wasm-go-sdk v0.16.0
github.com/tidwall/gjson v1.14.0
github.com/tidwall/gjson v1.14.1
)

require (
Expand Down
5 changes: 2 additions & 3 deletions examples/json_validation/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/tidwall/gjson v1.14.0 h1:6aeJ0bzojgWLa82gDQHcx3S0Lr/O51I9bJ5nv6JFx5w=
github.com/tidwall/gjson v1.14.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
github.com/tidwall/gjson v1.14.1 h1:iymTbGkQBhveq21bEvAQ81I0LEBork8BFe1CUZXdyuo=
github.com/tidwall/gjson v1.14.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/tetratelabs/proxy-wasm-go-sdk

go 1.17

require github.com/stretchr/testify v1.7.0
require github.com/stretchr/testify v1.7.1

require (
github.com/davecgh/go-spew v1.1.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
Expand Down

0 comments on commit 16c315b

Please sign in to comment.