Emsdk 3.1.47 (#34)

* EMCC_DEBUG * What's going on? * fix cache key * remove debugging stuff * huh
bbrk24 · Oct 27, 2023 · c97c122 · c97c122
1 parent 6619ec5
commit c97c122
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/build-and-deploy-pages.yml b/.github/workflows/build-and-deploy-pages.yml
@@ -11,13 +11,20 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: numworks/setup-emscripten@bbc4f5e15974bc13e69fdadecfd1858ecb1c4dbb # there is no v1 tag/branch
-        with:
-          sdk: 3.1.42
+      - name: Get emscripten version
+        id: em-version
+        shell: bash
+        run: |
+          {
+            echo 'DETAILS<<EOF'
+            emcc -v 2>&1
+            echo EOF
+          } >>$GITHUB_OUTPUT
       - uses: actions/cache@v3
         with:
-          path: /opt/hostedtoolcache/emscripten/3.1.42/x64/upstream/emscripten/cache/sysroot/lib/wasm32-emscripten/lto
-          key: libs-${{ hashFiles('~/work/Trilangle/Trilangle/emsdk/upstream/emscripten/system/lib/**.c') }}
-          restore-keys: "libs-\n"
+          path: /opt/hostedtoolcache/emscripten/latest/x64/upstream/emscripten/cache/sysroot/lib/wasm32-emscripten/lto
+          key: libsv-${{ steps.em-version.outputs.DETAILS }}
+          # restore-keys intentionally omitted
       - name: Run build script
         shell: bash
         run: |

diff --git a/.github/workflows/lint-build.yml b/.github/workflows/lint-build.yml
@@ -63,14 +63,8 @@ jobs:
     runs-on: ubuntu-latest
     name: Verify wasm build
     steps:
-      # Largely copied from build-and-deploy-pages.jobs.build-wasm.steps
       - uses: actions/checkout@v4
       - uses: numworks/setup-emscripten@bbc4f5e15974bc13e69fdadecfd1858ecb1c4dbb
-      - uses: actions/cache@v3
-        with:
-          path: /opt/hostedtoolcache/emscripten/latest/x64/upstream/emscripten/cache/sysroot/lib/wasm32-emscripten/lto
-          key: libs-${{ hashFiles('~/work/Trilangle/Trilangle/emsdk/upstream/emscripten/system/lib/**.c') }}
-          restore-keys: "libs-\n"
       - name: Run build script
         shell: bash
         run: |