Merge branch 'main' into feat-wasi-threads

Author: toyobayashi

.github/workflows/main.yml

@@ -3,6 +3,7 @@ name: Build
 on:
   push:
     paths:
+    - .github/workflows/**
     - '**.ts'
     - '**.js'
     - '**.c'
@@ -22,7 +23,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: ['emscripten', 'wasi', 'wasi-threads']
+        target:
+        - 'wasm32-unknown-emscripten'
+        - 'wasm64-unknown-emscripten'
+        - 'wasm32-unknown-unknown'
+        - 'wasm32-wasi'
+        - 'wasm32-wasi-threads'
 
     steps:
     - uses: actions/checkout@v3
@@ -31,26 +37,20 @@ jobs:
         sudo apt-get update
         sudo apt-get install ninja-build
     - uses: mymindstorm/setup-emsdk@v11
-      if: ${{ matrix.target == 'emscripten' }}
+      if: ${{ contains(matrix.target, 'emscripten') }}
       with:
-        version: '3.1.29'
+        version: '3.1.32'
         # no-cache: true
         actions-cache-folder: 'emsdk-cache'
     - uses: actions-rs/toolchain@v1
-      if: ${{ matrix.target == 'wasi' }}
+      if: ${{ matrix.target == 'wasm32-unknown-unknown' || matrix.target == 'wasm32-wasi' }}
       with:
         toolchain: nightly
         default: true
-        target: wasm32-unknown-unknown
-    - uses: actions-rs/toolchain@v1
-      if: ${{ matrix.target == 'wasi' }}
-      with:
-        toolchain: nightly
-        default: true
-        target: wasm32-wasi
+        target: ${{ matrix.target }}
 
     - name: Install wasi-sdk
-      if: ${{ matrix.target == 'wasi' }}
+      if: ${{ matrix.target == 'wasm32-unknown-unknown' || matrix.target == 'wasm32-wasi' }}
       env:
         WASI_VERSION: '19'
         WASI_VERSION_FULL: '19.0'
@@ -62,7 +62,7 @@ jobs:
         tar zxvf wasi-sdk-${WASI_VERSION_FULL}-linux.tar.gz -C $WASI_SDK_PATH --strip 1
 
     - name: Install wasi-sdk with threads
-      if: ${{ matrix.target == 'wasi-threads' }}
+      if: ${{ matrix.target == 'wasm32-wasi-threads' }}
       env:
         WASI_VERSION: '20+threads'
         WASI_VERSION_FULL: '20.0.threads'
@@ -75,11 +75,11 @@ jobs:
 
     - uses: actions/setup-node@v3
       with:
-        node-version: '18.12.1'
+        node-version: ${{ (contains(matrix.target, 'emscripten') && '20.0.0-v8-canary202302081604228b65') || '18.12.1' }}
         registry-url: 'https://registry.npmjs.org'
       env:
         NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-    
+
     - name: NPM Install
       shell: bash
       run: |
@@ -92,9 +92,9 @@ jobs:
 
     # - name: Lint
     #   run: npm run lint
-    
+
     - name: Test wasm32-wasi-threads
-      if: ${{ matrix.target == 'wasi-threads' }}
+      if: ${{ matrix.target == 'wasm32-wasi-threads' }}
       env:
         WASI_VERSION: '20+threads'
         WASI_VERSION_FULL: '20.0.threads'
@@ -107,21 +107,21 @@ jobs:
         npm run test:wt -w packages/test
 
     - name: Test wasm32-unknown-emscripten
-      if: ${{ matrix.target == 'emscripten' }}
+      if: ${{ matrix.target == 'wasm32-unknown-emscripten' }}
       run: |
         npm run rebuild -w packages/test
         npm run test -w packages/test
 
     - name: Test wasm64-unknown-emscripten
-      if: ${{ matrix.target == 'emscripten' }}
+      if: ${{ matrix.target == 'wasm64-unknown-emscripten' }}
       env:
         MEMORY64: '1'
       run: |
         npm run rebuild -w packages/test
         npm run test -w packages/test
 
     - name: Test wasm32-wasi
-      if: ${{ matrix.target == 'wasi' }}
+      if: ${{ matrix.target == 'wasm32-wasi' }}
       env:
         WASI_VERSION: '19'
         WASI_VERSION_FULL: '19.0'
@@ -132,7 +132,7 @@ jobs:
         npm run test:w -w packages/test
 
     - name: Test wasm32-unknown-unknown
-      if: ${{ matrix.target == 'wasi' }}
+      if: ${{ matrix.target == 'wasm32-unknown-unknown' }}
       env:
         WASI_VERSION: '19'
         WASI_VERSION_FULL: '19.0'
@@ -187,6 +187,50 @@ jobs:
       shell: bash
       run: npm run build --workspaces --if-present
 
+  release:
+    name: Release
+    if: ${{ startsWith(github.event.ref, 'refs/tags') }}
+    needs: build
+    runs-on: ubuntu-latest
+    env:
+      WASI_VERSION: '19'
+      WASI_VERSION_FULL: '19.0'
+      WASI_SDK_PATH: './wasi-sdk-19.0'
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Install Ninja
+      run: |
+        sudo apt-get update
+        sudo apt-get install ninja-build
+    - uses: mymindstorm/setup-emsdk@v11
+      with:
+        version: '3.1.32'
+        # no-cache: true
+        actions-cache-folder: 'emsdk-cache'
+    - name: Install wasi-sdk
+      shell: bash
+      run: |
+        wget -q https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_VERSION}/wasi-sdk-${WASI_VERSION_FULL}-linux.tar.gz
+        mkdir -p $WASI_SDK_PATH
+        tar zxvf wasi-sdk-${WASI_VERSION_FULL}-linux.tar.gz -C $WASI_SDK_PATH --strip 1
+    - uses: actions/setup-node@v3
+      with:
+        node-version: '18.12.1'
+        registry-url: 'https://registry.npmjs.org'
+      env:
+        NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+    - name: NPM Install
+      shell: bash
+      run: |
+        npm install -g node-gyp
+        npm install
+
+    - name: NPM Build
+      shell: bash
+      run: npm run build --workspaces --if-present
+
     - name: Publish
       run: |
         node ./script/release.js

.gitignore

@@ -6,7 +6,6 @@
 node_modules
 !example/node_modules
 /include/node_api_full.h
-/dist
 package-lock.json
 /example/build
 out