update node version and fixed error of documents action

sony · May 12, 2023 · 9a4be61 · 9a4be61
1 parent a5d8145
commit 9a4be61
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 5 deletions.
diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 18
       - name: Setup EMSDK
         run: |
           mkdir -p ${{ env.EMSDK_DIR }}/../

diff --git a/.github/workflows/document.yml b/.github/workflows/document.yml
@@ -7,13 +7,28 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     env:
+      CORE_PACKAGE_DIR: "./packages/mapray"
       DOC_DIR: "./doc/typedoc"
       DOC_DEPLOY_DIR: "./_deploy/doc/"
+      EMSDK_DIR: "./_deploy/emsdk"
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 18
+      - name: Setup EMSDK
+        run: |
+          mkdir -p ${{ env.EMSDK_DIR }}/../
+          echo "Cloning EMSDK from github"
+          git clone --branch=2.0.9 --depth=1 https://github.com/emscripten-core/emsdk.git ${{ env.EMSDK_DIR }}
+          echo "Coping patch file to the EMSDK directory"
+          cp ${{ env.CORE_PACKAGE_DIR }}/wasm/emsdk.patch ${{ env.EMSDK_DIR }}/emsdk.patch
+          echo "Install and Activate EMSDK"
+          cd ${{ env.EMSDK_DIR }}
+          ./emsdk install latest
+          ./emsdk activate latest
+          echo "Apply the patch to EMSDK"
+          git apply -p1 emsdk.patch
       - run:  git fetch --prune --unshallow
       - name: Get deploy version
         run: |
@@ -23,6 +38,14 @@ jobs:
         id: get_version
         shell: bash
         working-directory: ${{ env.CORE_PACKAGE_DIR }}
+      - name: Build wasm code
+        run: |
+          echo "Activate EMSDK"
+          source ${{ env.EMSDK_DIR }}/emsdk_env.sh
+          echo "Build wasm code"
+          cd ${{ env.CORE_PACKAGE_DIR }}
+          ./wasm/rebuild_and_install.sh
+        shell: bash
       - name: Setup
         run: yarn install
       - name: Generate documents

diff --git a/.github/workflows/npm_deploy_prerelease.yml b/.github/workflows/npm_deploy_prerelease.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 18
           registry-url: https://registry.npmjs.org
           scope: '@mapray'
       - name: Setup EMSDK

diff --git a/.github/workflows/npm_deploy_release.yml b/.github/workflows/npm_deploy_release.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 18
           registry-url: https://registry.npmjs.org
           scope: '@mapray'
       - name: Setup EMSDK

diff --git a/.github/workflows/purejs_deploy_release_and_prerelease.yml b/.github/workflows/purejs_deploy_release_and_prerelease.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 18
       - id: 'gcp-auth'
         uses: 'google-github-actions/auth@v1'
         with: