Update to upstream TinyGo 0.27.0 (#150)

corazawaf · Feb 13, 2023 · 1afad8c · 1afad8c
1 parent 0d6d8a3
commit 1afad8c
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 122 deletions.
diff --git a/.github/workflows/buildtools-tinygo.yaml b/.github/workflows/buildtools-tinygo.yaml
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -13,8 +13,7 @@ on:
 
 env:
   GO_VERSION: 1.19
-  TINYGO_VERSION: 0.26.0
-  WABT_VERSION: 1.0.29
+  TINYGO_VERSION: 0.27.0
   # Test against latest two releases and latest dev
   ENVOY_IMAGES: >
     envoyproxy/envoy:v1.24-latest

diff --git a/.github/workflows/nightly-coraza-check.yaml b/.github/workflows/nightly-coraza-check.yaml
@@ -9,8 +9,7 @@ on:
 
 env:
   GO_VERSION: 1.19
-  TINYGO_VERSION: 0.26.0
-  WABT_VERSION: 1.0.29
+  TINYGO_VERSION: 0.27.0
 
 jobs:
   test:
@@ -25,15 +24,11 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
           cache: true
 
-      - name: Install TinyGo and wabt
+      - name: Install TinyGo
         run: |
           gh release download v${TINYGO_VERSION} -p '*.linux-amd64.tar.gz' -D ~ -R github.com/tinygo-org/tinygo
           tar -xf ~/tinygo${TINYGO_VERSION}.linux-amd64.tar.gz  -C $HOME
           echo "$HOME/tinygo/bin" >> $GITHUB_PATH
-
-          gh release download ${WABT_VERSION} -p '*-ubuntu.tar.gz' -D ~ -R github.com/WebAssembly/wabt
-          tar -xf ~/wabt-${WABT_VERSION}-ubuntu.tar.gz  -C $HOME
-          echo "$HOME/wabt-${WABT_VERSION}/bin" >> $GITHUB_PATH
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/buildtools/tinygo/Dockerfile b/buildtools/tinygo/Dockerfile
diff --git a/buildtools/tinygo/wasi-libc.Dockerfile b/buildtools/tinygo/wasi-libc.Dockerfile
diff --git a/magefiles/magefile.go b/magefiles/magefile.go
@@ -20,7 +20,7 @@ import (
 )
 
 var minGoVersion = "1.19"
-var tinygoMinorVersion = "0.26"
+var tinygoMinorVersion = "0.27"
 var addLicenseVersion = "04bfe4ee9ca5764577b029acc6a1957fd1997153" // https://github.com/google/addlicense
 var golangCILintVer = "v1.48.0"                                    // https://github.com/golangci/golangci-lint/releases
 var gosImportsVer = "v0.3.1"                                       // https://github.com/rinchsan/gosimports/releases/tag/v0.3.1
@@ -185,16 +185,7 @@ func Build() error {
 		}
 	}
 
-	wd, err := os.Getwd()
-	if err != nil {
-		return err
-	}
-
-	script := fmt.Sprintf(`
-cd /src && \
-tinygo build -gc=custom -opt=2 -o %s -scheduler=none -target=wasi %s`, filepath.Join("build", "mainraw.wasm"), buildTagArg)
-	if err := sh.RunV("docker", "run", "--pull=always", "--rm", "-v", fmt.Sprintf("%s:/src", wd), "ghcr.io/corazawaf/coraza-proxy-wasm/buildtools-tinygo:sha-96443bb",
-		"bash", "-c", script); err != nil {
+	if err := sh.RunV("tinygo", "build", "-gc=custom", "-opt=2", "-o", filepath.Join("build", "mainraw.wasm"), "-scheduler=none", "-target=wasi", buildTagArg); err != nil {
 		return err
 	}