update: final edits to v1 spec

.github/workflows/release.yml

@@ -10,38 +10,6 @@ env:
   CGO_ENABLED: 0
 
 jobs:
-  watm_tinygo_v0_artifacts:
-    name: "watm: build ${{ matrix.watm.name }}.v0.tinygo.wasm with TinyGo"
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        watm: [ 
-          { name: "plain", scheduler: "none", gc: "conservative", tags: "purego" }, 
-          { name: "reverse", scheduler: "none", gc: "conservative", tags: "purego" }, 
-          { name: "utls", scheduler: "asyncify", gc: "conservative", tags: "purego" }
-        ]
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-go@v5
-      with:
-        go-version: "1.22.x"
-    - uses: acifani/setup-tinygo@v2
-      with:
-        tinygo-version: '0.32.0'
-    - name: Build WATM Artifacts
-      run: tinygo build -o ../../../${{ matrix.watm.name }}.v0.tinygo.wasm 
-        -target=wasi -no-debug -scheduler=${{ matrix.watm.scheduler }} 
-        -gc=${{ matrix.watm.gc }} -tags=${{ matrix.watm.tags }} 
-        ./${{ matrix.watm.name }}/
-      working-directory: ./tinygo/v0/examples/
-    - name: Upload Artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: ${{ matrix.watm.name }}.v0.tinygo
-        path: ${{ matrix.watm.name }}.v0.tinygo.wasm
-        retention-days: 1
-
   watm_tinygo_v1_artifacts:
     name: "watm: build ${{ matrix.watm.name }}.v1.tinygo.wasm with TinyGo"
     runs-on: ubuntu-latest
@@ -76,7 +44,6 @@ jobs:
 
   release:
     needs: 
-      - watm_tinygo_v0_artifacts
       - watm_tinygo_v1_artifacts
     name: "Release WATM Examples for ${{ github.ref_name }}"
     runs-on: ubuntu-latest

.github/workflows/watm.yml

@@ -37,29 +37,6 @@ jobs:
           go build -v ./...
           go test -v ./...
 
-  watm_build_tinygo_v0_examples:
-    name: "build ${{ matrix.examples }}.v0.tinygo.wasm w/ tinygo ${{ matrix.tinygo }} (go${{ matrix.go }})"
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        tinygo: [ "0.32.0" ] # latest tinygo version ONLY (1)
-        go: [ "1.21.x", "1.22.x" ] # latest 2 stable versions of Go. TODO: bump to 1.22.x once tinygo support added.
-        examples: [ "plain", "reverse", "utls" ] # Add examples here per ones under tinygo/v0/examples
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-go@v5
-      with:
-        go-version: ${{ matrix.go }}
-    - uses: acifani/setup-tinygo@v2
-      with:
-        tinygo-version: ${{ matrix.tinygo }}
-    - name: Build
-      run: |
-        mkdir -p tmp
-        tinygo build -o tmp/${{ matrix.examples }}.wasm -target=wasi -tags=purego ./${{ matrix.examples }}/
-      working-directory: ./tinygo/v0/examples/
-
   watm_build_tinygo_v1_examples:
     name: "build ${{ matrix.examples }}.v1.tinygo.wasm w/ tinygo ${{ matrix.tinygo }} (go${{ matrix.go }})"
     runs-on: ubuntu-latest

tinygo/snippets/go.mod

@@ -2,6 +2,6 @@ module github.com/refraction-networking/watm/tinygo/snippets
 
 go 1.20
 
-replace github.com/tetratelabs/wazero v1.6.0 => github.com/refraction-networking/wazero v1.6.6-w
+replace github.com/tetratelabs/wazero v1.7.3 => github.com/refraction-networking/wazero v1.7.3-w
 
-require github.com/tetratelabs/wazero v1.6.0
+require github.com/tetratelabs/wazero v1.7.3

tinygo/snippets/go.sum

@@ -1,2 +1,2 @@
-github.com/refraction-networking/wazero v1.6.6-w h1:GopGAQ5/Rah0vzGImewwOrOaXFR+FmgWlgGKs1JpVlw=
-github.com/refraction-networking/wazero v1.6.6-w/go.mod h1:ytl6Zuh20R/eROuyDaGPkp82O9C/DJfXAwJfQ3X6/7Y=
+github.com/refraction-networking/wazero v1.7.3-w h1:Br3UuVPrKAD3pUSIlpT1+iBIYMbs8h2wS4d0ziU9Yoc=
+github.com/refraction-networking/wazero v1.7.3-w/go.mod h1:ytl6Zuh20R/eROuyDaGPkp82O9C/DJfXAwJfQ3X6/7Y=

tinygo/snippets/poll_oneoff/main.go

@@ -18,8 +18,7 @@ var pollWasm []byte
 
 func main() {
 	ctx := context.Background()
-	ctx = context.WithValue(ctx, experimental.FunctionListenerFactoryKey{},
-		logging.NewHostLoggingListenerFactory(os.Stderr, logging.LogScopeFilesystem|logging.LogScopePoll|logging.LogScopeSock))
+	ctx = experimental.WithFunctionListenerFactory(ctx, logging.NewHostLoggingListenerFactory(os.Stderr, logging.LogScopeFilesystem|logging.LogScopePoll|logging.LogScopeSock))
 
 	r := wazero.NewRuntime(ctx)
 	defer r.Close(ctx)