From e136d442d2820bbc5b2248ad6e57abea322392fd Mon Sep 17 00:00:00 2001
From: Takeshi Yoneda <t.y.mathetake@gmail.com>
Date: Tue, 20 Aug 2024 08:28:45 -0700
Subject: [PATCH 1/2] ci: Updates TinyGo to 0.33

Signed-off-by: Takeshi Yoneda <t.y.mathetake@gmail.com>
---
 .github/workflows/commit.yaml      | 6 +++---
 .github/workflows/examples.yaml    | 6 +++---
 .github/workflows/integration.yaml | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/commit.yaml b/.github/workflows/commit.yaml
index 01cd1a3f12..330062a9bb 100644
--- a/.github/workflows/commit.yaml
+++ b/.github/workflows/commit.yaml
@@ -158,11 +158,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
-        with:  # Use version consistent with TinyGo.
-          go-version: "1.22"
+        with:
+          go-version: ${{ env.GO_VERSION }}
       - uses: acifani/setup-tinygo@v2
         with:
-          tinygo-version: "0.32.0"
+          tinygo-version: "0.33.0"
       - run: tinygo build ./cmd/wazero
       - run: tinygo build -size short -target pico -stack-size=8kb ./cmd/wazero
 
diff --git a/.github/workflows/examples.yaml b/.github/workflows/examples.yaml
index 40b6729d4a..b47a1885f5 100644
--- a/.github/workflows/examples.yaml
+++ b/.github/workflows/examples.yaml
@@ -17,7 +17,7 @@ on:
 
 env:
   EMSDK_VERSION: "3.1.40"
-  TINYGO_VERSION: "0.32.0"
+  TINYGO_VERSION: "0.33.0"
   ZIG_VERSION: "0.11.0"
 
 concurrency:
@@ -32,9 +32,9 @@ jobs:
     name: Build examples
     runs-on: ubuntu-22.04
     strategy:
-      matrix:  # Use versions consistent with TinyGo.
+      matrix:
         go-version:
-          - "1.22"
+          - "1.23"
           - "1.21"
 
     steps:
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
index 7b3fd6fa48..95719ade48 100644
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -19,7 +19,7 @@ defaults:
 
 env:  # Update this prior to requiring a higher minor version in go.mod
   GO_VERSION: "1.23"
-  TINYGO_VERSION: "0.32.0"
+  TINYGO_VERSION: "0.33.0"
   ZIG_VERSION: "0.11.0"
   BINARYEN_VERSION: "116"
   STDLIB_TESTS: "internal/integration_test/stdlibs"
@@ -146,8 +146,8 @@ jobs:
 
       - uses: actions/setup-go@v4
         if: steps.binary-cache.outputs.cache-hit != 'true'
-        with:  # Use version consistent with TinyGo.
-          go-version: "1.22"
+        with:
+          go-version: ${{ env.GO_VERSION }}
 
       - name: Build Test Binaries
         if: steps.binary-cache.outputs.cache-hit != 'true'

From 9ac1c982b867e0ed7dc494fc2ee11023d4ceac81 Mon Sep 17 00:00:00 2001
From: Takeshi Yoneda <t.y.mathetake@gmail.com>
Date: Tue, 20 Aug 2024 08:43:01 -0700
Subject: [PATCH 2/2] seeya

Signed-off-by: Takeshi Yoneda <t.y.mathetake@gmail.com>
---
 .github/workflows/commit.yaml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/.github/workflows/commit.yaml b/.github/workflows/commit.yaml
index 330062a9bb..fc3027c726 100644
--- a/.github/workflows/commit.yaml
+++ b/.github/workflows/commit.yaml
@@ -152,20 +152,6 @@ jobs:
         # This runs all tests compiled above in sequence. Note: This mounts /tmp to allow t.TempDir() in tests.
         run: find . -name "*.test" | xargs -Itestbin docker run --platform linux/${{ matrix.arch }} -v $(pwd)/testbin:/test -v $(pwd)/wazerocli:/wazero -e WAZEROCLI=/wazero --tmpfs /tmp --rm -t wazero:test
 
-  test_tinygo:
-    name: "TinyGo on Ubuntu"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
-        with:
-          go-version: ${{ env.GO_VERSION }}
-      - uses: acifani/setup-tinygo@v2
-        with:
-          tinygo-version: "0.33.0"
-      - run: tinygo build ./cmd/wazero
-      - run: tinygo build -size short -target pico -stack-size=8kb ./cmd/wazero
-
   # This ensures that internal/integration_test/fuzz is runnable, and is not intended to
   # run full-length fuzzing while trying to find low-hanging frontend bugs.
   fuzz: