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

Commit d4d155b

Browse files
authored
Test against Envoy 1.17.0 (#113)
1 parent eb6b418 commit d4d155b

File tree

3 files changed

+14
-18
lines changed

3 files changed

+14
-18
lines changed

.github/workflows/workflow.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
name: build examples
3333
runs-on: ubuntu-latest
3434
container:
35-
image: tinygo/tinygo:latest
35+
image: tinygo/tinygo:0.16.0
3636
steps:
3737
- name: checkout
3838
uses: actions/checkout@v2
@@ -46,12 +46,12 @@ jobs:
4646

4747
- name: build examples
4848
if: steps.cache-built-examples.outputs.cache-hit != 'true'
49-
run: find ./examples -type f -name "main.go" | xargs -Ip tinygo build -o p.wasm -scheduler=none -target=wasi -wasm-abi=generic p
49+
run: find ./examples -type f -name "main.go" | xargs -Ip tinygo build -o p.wasm -scheduler=none -target=wasi p
5050

5151
e2e-tests-envoy:
5252
strategy:
5353
matrix:
54-
envoy-image: [ "envoyproxy/envoy-dev:d2e277e1668044ba50397c71d26e8f519d4734a0" ]
54+
envoy-image: [ "envoyproxy/envoy:v1.17.0" ]
5555
name: e2e tests on examples
5656
needs: build-examples
5757
runs-on: ubuntu-latest

Makefile

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
.PHONY: build.example build.example.docker build.examples build.examples.docker lint test test.sdk test.e2e
44

55
build.example:
6-
tinygo build -o ./examples/${name}/main.go.wasm -scheduler=none -target=wasi -wasm-abi=generic ./examples/${name}/main.go
6+
tinygo build -o ./examples/${name}/main.go.wasm -scheduler=none -target=wasi ./examples/${name}/main.go
77

88
build.example.docker:
9-
docker run -it -w /tmp/proxy-wasm-go -v $(shell pwd):/tmp/proxy-wasm-go tinygo/tinygo-dev:latest \
9+
docker run -it -w /tmp/proxy-wasm-go -v $(shell pwd):/tmp/proxy-wasm-go tinygo/tinygo:0.16.0 \
1010
tinygo build -o /tmp/proxy-wasm-go/examples/${name}/main.go.wasm -scheduler=none -target=wasi \
11-
-wasm-abi=generic /tmp/proxy-wasm-go/examples/${name}/main.go
11+
/tmp/proxy-wasm-go/examples/${name}/main.go
1212

1313
build.examples:
14-
find ./examples -type f -name "main.go" | xargs -Ip tinygo build -o p.wasm -scheduler=none -target=wasi -wasm-abi=generic p
14+
find ./examples -type f -name "main.go" | xargs -Ip tinygo build -o p.wasm -scheduler=none -target=wasi p
1515

1616
build.examples.docker:
17-
docker run -it -w /tmp/proxy-wasm-go -v $(shell pwd):/tmp/proxy-wasm-go tinygo/tinygo:latest /bin/bash -c \
18-
'find /tmp/proxy-wasm-go/examples/ -type f -name "main.go" | xargs -Ip tinygo build -o p.wasm -scheduler=none -target=wasi -wasm-abi=generic p'
17+
docker run -it -w /tmp/proxy-wasm-go -v $(shell pwd):/tmp/proxy-wasm-go tinygo/tinygo:0.16.0 /bin/bash -c \
18+
'find /tmp/proxy-wasm-go/examples/ -type f -name "main.go" | xargs -Ip tinygo build -o p.wasm -scheduler=none -target=wasi p'
1919

2020
lint:
2121
golangci-lint run --build-tags proxytest
@@ -30,8 +30,4 @@ test.e2e.single:
3030
go test -v ./e2e -run ${name}
3131

3232
run:
33-
docker run --entrypoint='/usr/local/bin/envoy' \
34-
-p 18000:18000 -p 8099:8099 \
35-
-w /tmp/envoy -v $(shell pwd):/tmp/envoy istio/proxyv2:1.8.1 \
36-
-c /tmp/envoy/examples/${name}/envoy.yaml --concurrency 2 \
37-
--log-format-prefix-with-location '0' --log-format '%v' # --log-format-prefix-with-location will be removed at 1.17.0 release
33+
envoy -c ./examples/${name}/envoy.yaml --concurrency 2 --log-format '%v'

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ Please follow the official instruction [here](https://tinygo.org/getting-started
4444

4545
| proxy-wasm-go-sdk| proxy-wasm ABI version |istio/proxyv2| Envoy upstream|
4646
|:-------------:|:-------------:|:-------------:|:-------------:|
47-
| main | 0.2.0| v1.8.1 | [d2e277e1668044ba503](https://github.com/envoyproxy/envoy/tree/d2e277e1668044ba50397c71d26e8f519d4734a0) |
47+
| main | 0.2.0| v1.8.1 | v1.17.0 |
48+
| v0.0.14 | 0.2.0| v1.8.1 | v1.17.0 |
4849
| v0.0.13 | 0.2.0| v1.8.1 | [5932dfd1f6b80eda9f56](https://github.com/envoyproxy/envoy/tree/5932dfd1f6b80eda9f56415ceff056a15a699c5e) |
49-
| v0.0.12 | 0.2.0| v1.7.x, v1.8.0 |[6ca4644073da6d9930](https://github.com/envoyproxy/envoy/tree/6ca4644073da6d9930ba45d90d57d8c9b2062962)
5050

5151

5252
## run examples
@@ -72,10 +72,10 @@ make run name=helloworld
7272
```bash
7373
make test # run local tests without running envoy processes
7474

75-
## requires you to have the Envoy binary locally
75+
## requires you to have Envoy binary locally
7676
make test.e2e # run e2e tests
7777

78-
## requires you to have the Envoy binary locally
78+
## requires you to have Envoy binary locally
7979
make test.e2e.single name=helloworld # run e2e tests
8080
```
8181

0 commit comments

Comments
 (0)