Merge pull request #134 from fastly/dgryski/tinygo-0.33

bump tinygo version
fastly · Aug 21, 2024 · d70a99b · d70a99b
2 parents 645c8ce + 2cc4363
commit d70a99b
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 17 deletions.
diff --git a/.github/actions/install-tinygo/action.yml b/.github/actions/install-tinygo/action.yml
@@ -4,7 +4,7 @@ inputs:
  tinygo-version:
  description: "The version of TinyGo to install"
  required: true
- default: "0.27.0"
+ default: "0.33.0"
 runs:
  using: "composite"
  steps:

diff --git a/.github/workflows/build-examples.yml b/.github/workflows/build-examples.yml
@@ -12,8 +12,8 @@ jobs:
  matrix:
  include:
  # Newest supported configuration
- - go-version: '1.22' # pairs with TinyGo 0.31.2
- tinygo-version: '0.31.2'
+ - go-version: '1.23' # pairs with TinyGo 0.33.0
+ tinygo-version: '0.33.0'
  # Oldest supported configuration
  - go-version: '1.21' # pairs with TinyGo 0.29.0
  tinygo-version: '0.29.0'

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -15,10 +15,16 @@ jobs:
  - go-version: '1.22' # pairs with TinyGo 0.31.2
  tinygo-version: '0.31.2'
  wasmtime-version: 'latest'
+ tinygo-wasi-target: 'wasi'
  # Oldest supported configuration
  - go-version: '1.21' # pairs with TinyGo 0.29.0
  tinygo-version: '0.29.0'
  wasmtime-version: '21.0.1' # pairs with TinyGo 0.29.0
+ tinygo-wasi-target: 'wasi'
+ - go-version: '1.23' # pairs with TinyGo 0.33.0
+ tinygo-version: '0.33.0'
+ wasmtime-version: '21.0.1' # pairs with TinyGo 0.33.0
+ tinygo-wasi-target: 'wasip1'
 
  steps:
  - uses: actions/checkout@v4
@@ -58,22 +64,19 @@ jobs:
  wasmtime --version
 
  - name: Tests - Go
- run: go test -v -race -tags="fastlyinternaldebug nofastlyhostcalls" ./...
+ run: go test -race -tags="fastlyinternaldebug nofastlyhostcalls" ./...
 
  - name: Tests - TinyGo
- env:
- GOARCH: wasm
- GOOS: wasip1
- run: tinygo test -v -tags="fastlyinternaldebug nofastlyhostcalls" ./...
+ run: tinygo test -target=${{ matrix.tinygo-wasi-target }} -tags="fastlyinternaldebug nofastlyhostcalls" ./...
 
  - name: Integration Tests - Go
  env:
  RUST_LOG: viceroy=info,viceroy-lib=info
  GOARCH: wasm
  GOOS: wasip1
- run: go test -v -tags="fastlyinternaldebug" -exec "viceroy run -C fastly.toml" ./integration_tests/...
+ run: go test -tags="fastlyinternaldebug" -exec "viceroy run -C fastly.toml" ./integration_tests/...
 
  - name: Integration Tests - TinyGo
  env:
  RUST_LOG: viceroy=info,viceroy-lib=info
- run: tinygo test -v -tags="fastlyinternaldebug" -target=fastly-compute.json ./integration_tests/...
+ run: tinygo test -tags="fastlyinternaldebug" -target=targets/fastly-compute-${{ matrix.tinygo-wasi-target }}.json ./integration_tests/...
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -12,7 +12,7 @@ jobs:
  - uses: actions/checkout@v4
  - uses: actions/setup-go@v5
  with:
- go-version: stable
+ go-version: oldstable
 
  - name: go vet
  run: go vet ./...
@@ -42,7 +42,7 @@ jobs:
  go-version: stable
  - uses: ./.github/actions/install-tinygo
  with:
- tinygo-version: '0.31.2'
+ tinygo-version: '0.33.0'
 
  - name: Set up Wasmtime
  uses: bytecodealliance/actions/wasmtime/setup@v1
@@ -54,10 +54,7 @@ jobs:
  wasmtime --version
 
  - name: Tests - Go
- run: go test -v -race -tags="fastlyinternaldebug nofastlyhostcalls" ./...
+ run: go test -race -tags="fastlyinternaldebug nofastlyhostcalls" ./...
 
  - name: Tests - TinyGo
- env:
- GOARCH: wasm
- GOOS: wasip1
- run: tinygo test -v -tags="fastlyinternaldebug nofastlyhostcalls" ./...
+ run: tinygo test -target=wasip1 -tags="fastlyinternaldebug nofastlyhostcalls" ./...
diff --git a/fastly-compute.json → targets/fastly-compute-wasi.json b/fastly-compute.json → targets/fastly-compute-wasi.json
diff --git a/targets/fastly-compute-wasip1.json b/targets/fastly-compute-wasip1.json
@@ -0,0 +1,4 @@
+{
+ "inherits": ["wasip1"],
+ "emulator": "viceroy run -C fastly.toml {}"
+}