From 41095bab1b979b1b16886e2816a8ac02d6bc37ac Mon Sep 17 00:00:00 2001 From: Gaukas Wang Date: Thu, 20 Jun 2024 08:26:25 +0800 Subject: [PATCH] update: minor non-functional changes (#10) --- .github/workflows/release.yml | 11 +++++--- .github/workflows/watm.yml | 6 ++--- tinygo/v0/examples/go.mod | 14 +++++----- tinygo/v0/examples/go.sum | 40 ++++++----------------------- tinygo/v0/netpoll.go | 4 +-- tinygo/v1/examples/go.mod | 14 +++++----- tinygo/v1/examples/go.sum | 40 ++++++----------------------- tinygo/v1/net/poll.go | 4 +-- tinygo/v1/wasiimport/import_wasi.go | 2 +- 9 files changed, 41 insertions(+), 94 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 07d36be..1f77dab 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: go-version: "1.22.x" - uses: acifani/setup-tinygo@v2 with: - tinygo-version: '0.31.1' + 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 }} @@ -60,7 +60,7 @@ jobs: go-version: "1.22.x" - uses: acifani/setup-tinygo@v2 with: - tinygo-version: '0.31.1' + tinygo-version: '0.32.0' - name: Build WATM Artifacts run: tinygo build -o ../../../${{ matrix.watm.name }}.v1.tinygo.wasm -target=wasi -no-debug -scheduler=${{ matrix.watm.scheduler }} @@ -87,9 +87,12 @@ jobs: - name: List Artifacts run: ls -R release-${{ github.ref_name }} - name: Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 # if: startsWith(github.ref, 'refs/tags/') with: name: ${{ github.ref_name }} files: | - release-${{ github.ref_name }}/**/*.wasm \ No newline at end of file + release-${{ github.ref_name }}/**/*.wasm + prerelease: true + body: | + Automatically build for ${{ github.ref_name }} by softprops/action-gh-release. Attached artifacts are not automatically validated or tested with the latest WATER. diff --git a/.github/workflows/watm.yml b/.github/workflows/watm.yml index 86819b8..ccca765 100644 --- a/.github/workflows/watm.yml +++ b/.github/workflows/watm.yml @@ -43,7 +43,7 @@ jobs: strategy: fail-fast: true matrix: - tinygo: [ "0.31.1" ] # latest tinygo version ONLY (1) + 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: @@ -66,7 +66,7 @@ jobs: strategy: fail-fast: true matrix: - tinygo: [ "0.31.1" ] # latest tinygo version ONLY (1) + 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: @@ -81,4 +81,4 @@ jobs: run: | mkdir -p tmp tinygo build -o tmp/${{ matrix.examples }}.wasm -target=wasi -tags=purego ./${{ matrix.examples }}/ - working-directory: ./tinygo/v1/examples/ \ No newline at end of file + working-directory: ./tinygo/v1/examples/ diff --git a/tinygo/v0/examples/go.mod b/tinygo/v0/examples/go.mod index c34c009..2213dcf 100644 --- a/tinygo/v0/examples/go.mod +++ b/tinygo/v0/examples/go.mod @@ -8,17 +8,15 @@ replace github.com/refraction-networking/watm => ../../../ require ( github.com/CosmWasm/tinyjson v0.9.0 - github.com/refraction-networking/utls v1.6.3-wasm - github.com/refraction-networking/watm v0.0.0-00010101000000-000000000000 + github.com/refraction-networking/utls v1.6.6-wasm + github.com/refraction-networking/watm v0.6.5 ) require ( github.com/andybalholm/brotli v1.1.0 // indirect - github.com/cloudflare/circl v1.3.7 // indirect + github.com/cloudflare/circl v1.3.9 // indirect github.com/josharian/intern v1.0.0 // indirect - github.com/klauspost/compress v1.17.7 // indirect - github.com/quic-go/quic-go v0.42.0 // indirect - golang.org/x/crypto v0.22.0 // indirect - golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect - golang.org/x/sys v0.19.0 // indirect + github.com/klauspost/compress v1.17.9 // indirect + golang.org/x/crypto v0.24.0 // indirect + golang.org/x/sys v0.21.0 // indirect ) diff --git a/tinygo/v0/examples/go.sum b/tinygo/v0/examples/go.sum index 87c6bce..5149b10 100644 --- a/tinygo/v0/examples/go.sum +++ b/tinygo/v0/examples/go.sum @@ -2,37 +2,13 @@ github.com/CosmWasm/tinyjson v0.9.0 h1:sPjgikATp5W0vD/v/Qz99uQ6G/lh/SuK0Wfskqua4 github.com/CosmWasm/tinyjson v0.9.0/go.mod h1:5+7QnSKrkIWnpIdhUT2t2EYzXnII3/3MlM0oDsBSbc8= github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= -github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= -github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/cloudflare/circl v1.3.9 h1:QFrlgFYf2Qpi8bSpVPK1HBvWpx16v/1TZivyo7pGuBE= +github.com/cloudflare/circl v1.3.9/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= -github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= -github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q= -github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k= -github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= -github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= -github.com/quic-go/quic-go v0.42.0 h1:uSfdap0eveIl8KXnipv9K7nlwZ5IqLlYOpJ58u5utpM= -github.com/quic-go/quic-go v0.42.0/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M= -github.com/refraction-networking/utls v1.6.3-wasm h1:QJQk3ZGZzKFPHxSQ/DP/xqiIwArB9Lw8AweGyqL6kE0= -github.com/refraction-networking/utls v1.6.3-wasm/go.mod h1:yil9+7qSl+gBwJqztoQseO6Pr3h62pQoY1lXiNR/FPs= -golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= -golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= -golang.org/x/exp v0.0.0-20221205204356-47842c84f3db h1:D/cFflL63o2KSLJIwjlcIt8PR064j/xsmdEJL/YvY/o= -golang.org/x/exp v0.0.0-20221205204356-47842c84f3db/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo= -golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/refraction-networking/utls v1.6.6-wasm h1:fayTy1wZzzNSZqJ9rzMgDOoGVLS9/u0YIRQ9fUurlc0= +github.com/refraction-networking/utls v1.6.6-wasm/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0= +golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= +golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= diff --git a/tinygo/v0/netpoll.go b/tinygo/v0/netpoll.go index d71d27e..3379051 100644 --- a/tinygo/v0/netpoll.go +++ b/tinygo/v0/netpoll.go @@ -35,8 +35,6 @@ import ( // Since poll_oneoff is similar to poll(2), the implementation here was derived // from netpoll_aix.go. -const _EINTR = 27 - const ( EventFdRead uint16 = iota + 1 // readable event EventFdWrite // writeable event @@ -111,7 +109,7 @@ func _poll(fds []pollFd, maxTimeout int64) (nevents int32, err error) { retry: errno := poll_oneoff(unsafe.Pointer(&pollsubs[0]), unsafe.Pointer(&evts[0]), uint32(len(pollsubs)), unsafe.Pointer(&nevents)) if errno != 0 { - if errno != _EINTR { + if errno != uint32(syscall.EINTR) { return 0, syscall.Errno(errno) } diff --git a/tinygo/v1/examples/go.mod b/tinygo/v1/examples/go.mod index a84d5ac..eae6464 100644 --- a/tinygo/v1/examples/go.mod +++ b/tinygo/v1/examples/go.mod @@ -8,17 +8,15 @@ replace github.com/refraction-networking/watm => ../../../ require ( github.com/CosmWasm/tinyjson v0.9.0 - github.com/refraction-networking/utls v1.6.3-wasm - github.com/refraction-networking/watm v0.0.0-00010101000000-000000000000 + github.com/refraction-networking/utls v1.6.6-wasm + github.com/refraction-networking/watm v0.6.5 ) require ( github.com/andybalholm/brotli v1.1.0 // indirect - github.com/cloudflare/circl v1.3.7 // indirect + github.com/cloudflare/circl v1.3.9 // indirect github.com/josharian/intern v1.0.0 // indirect - github.com/klauspost/compress v1.17.7 // indirect - github.com/quic-go/quic-go v0.42.0 // indirect - golang.org/x/crypto v0.22.0 // indirect - golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect - golang.org/x/sys v0.19.0 // indirect + github.com/klauspost/compress v1.17.9 // indirect + golang.org/x/crypto v0.24.0 // indirect + golang.org/x/sys v0.21.0 // indirect ) diff --git a/tinygo/v1/examples/go.sum b/tinygo/v1/examples/go.sum index 87c6bce..5149b10 100644 --- a/tinygo/v1/examples/go.sum +++ b/tinygo/v1/examples/go.sum @@ -2,37 +2,13 @@ github.com/CosmWasm/tinyjson v0.9.0 h1:sPjgikATp5W0vD/v/Qz99uQ6G/lh/SuK0Wfskqua4 github.com/CosmWasm/tinyjson v0.9.0/go.mod h1:5+7QnSKrkIWnpIdhUT2t2EYzXnII3/3MlM0oDsBSbc8= github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= -github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= -github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/cloudflare/circl v1.3.9 h1:QFrlgFYf2Qpi8bSpVPK1HBvWpx16v/1TZivyo7pGuBE= +github.com/cloudflare/circl v1.3.9/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= -github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= -github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q= -github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k= -github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= -github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= -github.com/quic-go/quic-go v0.42.0 h1:uSfdap0eveIl8KXnipv9K7nlwZ5IqLlYOpJ58u5utpM= -github.com/quic-go/quic-go v0.42.0/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M= -github.com/refraction-networking/utls v1.6.3-wasm h1:QJQk3ZGZzKFPHxSQ/DP/xqiIwArB9Lw8AweGyqL6kE0= -github.com/refraction-networking/utls v1.6.3-wasm/go.mod h1:yil9+7qSl+gBwJqztoQseO6Pr3h62pQoY1lXiNR/FPs= -golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= -golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= -golang.org/x/exp v0.0.0-20221205204356-47842c84f3db h1:D/cFflL63o2KSLJIwjlcIt8PR064j/xsmdEJL/YvY/o= -golang.org/x/exp v0.0.0-20221205204356-47842c84f3db/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo= -golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/refraction-networking/utls v1.6.6-wasm h1:fayTy1wZzzNSZqJ9rzMgDOoGVLS9/u0YIRQ9fUurlc0= +github.com/refraction-networking/utls v1.6.6-wasm/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0= +golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= +golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= diff --git a/tinygo/v1/net/poll.go b/tinygo/v1/net/poll.go index 1f78265..f773e07 100644 --- a/tinygo/v1/net/poll.go +++ b/tinygo/v1/net/poll.go @@ -37,8 +37,6 @@ import ( // Since poll_oneoff is similar to poll(2), the implementation here was derived // from netpoll_aix.go. -const _EINTR = 27 - const ( EventFdRead uint16 = iota + 1 // readable event EventFdWrite // writeable event @@ -113,7 +111,7 @@ func _poll(fds []pollFd, maxTimeout int64) (nevents int32, err error) { retry: errno := wasiimport.PollOneoff(unsafe.Pointer(&pollsubs[0]), unsafe.Pointer(&evts[0]), uint32(len(pollsubs)), unsafe.Pointer(&nevents)) if errno != 0 { - if errno != _EINTR { + if errno != uint32(syscall.EINTR) { return 0, syscall.Errno(errno) } diff --git a/tinygo/v1/wasiimport/import_wasi.go b/tinygo/v1/wasiimport/import_wasi.go index 1f0b427..b290431 100644 --- a/tinygo/v1/wasiimport/import_wasi.go +++ b/tinygo/v1/wasiimport/import_wasi.go @@ -6,7 +6,7 @@ import "unsafe" // Import the Runtime-imported dial function, // which takes iovs for network and address and -// returns a file descriptor for the dialled connection. +// returns a file descriptor for the dialed connection. // //go:wasmimport env water_dial //go:noescape