fix cache path

pygame-web · Oct 29, 2024 · 92a3870 · 92a3870
1 parent ee73a6e
commit 92a3870
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,10 +48,6 @@ jobs:
         chmod +x ./python-wasm-sdk.sh
         bash -c "./python-wasm-sdk.sh"
 
-    - name: Clean up
-      run: |
-        [ -f /tmp/sdk/emsdk.tar ] && rm /tmp/sdk/emsdk.tar
-
     - name: Upload sdk to Github artifacts
       uses: actions/upload-artifact@v3.1.1
       with:

diff --git a/python-wasi-sdk.sh b/python-wasi-sdk.sh
@@ -160,7 +160,7 @@ END
 
             mkdir -p src build ${SDKROOT}/devices/emsdk ${SDKROOT}/prebuilt/emsdk
 
-            if [ -f /tmp/sdk/emsdk.tar ]
+            if [ -f /tmp/emsdk.tar ]
             then
                 echo "
 
@@ -178,7 +178,7 @@ END
 
 "
                 pushd /
-                tar xfp /tmp/sdk/emsdk.tar
+                tar xfp /tmp/emsdk.tar
                 mkdir -p ${SDKROOT}/src ${SDKROOT}/build
                 popd
             fi
@@ -188,7 +188,7 @@ END
 
             echo " ---------- building cpython wasm support ${PYBUILD} ${CIVER} -----------" 1>&2
 
-            if [ -f /tmp/sdk/emsdk.tar ]
+            if [ -f /tmp/emsdk.tar ]
             then
                 echo " using cached cpython-build-emsdk-deps"
             else
@@ -209,7 +209,7 @@ END
  --exclude=${SDKROOT}/sources.* \
  --exclude=${SDKROOT}/build \
  --exclude=${SDKROOT}/src \
- -cpR $SDKROOT > /tmp/sdk/emsdk.tar
+ -cpR $SDKROOT > /tmp/emsdk.tar
 
                         date "+%d-%m-%4Y" > /tmp/sdk/emsdk.version
                         popd

diff --git a/python-wasm-sdk.sh b/python-wasm-sdk.sh
@@ -160,7 +160,7 @@ END
 
             mkdir -p src build ${SDKROOT}/devices/emsdk ${SDKROOT}/prebuilt/emsdk
 
-            if [ -f /tmp/sdk/emsdk.tar ]
+            if [ -f /tmp/emsdk.tar ]
             then
                 echo "
 
@@ -178,7 +178,7 @@ END
 
 "
                 pushd /
-                tar xfp /tmp/sdk/emsdk.tar
+                tar xfp /tmp/emsdk.tar
                 mkdir -p ${SDKROOT}/src ${SDKROOT}/build
                 popd
             fi
@@ -188,7 +188,7 @@ END
 
             echo " ---------- building cpython wasm support ${PYBUILD} ${CIVER} -----------" 1>&2
 
-            if [ -f /tmp/sdk/emsdk.tar ]
+            if [ -f /tmp/emsdk.tar ]
             then
                 echo " using cached cpython-build-emsdk-deps"
             else
@@ -209,7 +209,7 @@ END
  --exclude=${SDKROOT}/sources.* \
  --exclude=${SDKROOT}/build \
  --exclude=${SDKROOT}/src \
- -cpR $SDKROOT > /tmp/sdk/emsdk.tar
+ -cpR $SDKROOT > /tmp/emsdk.tar
 
                         date "+%d-%m-%4Y" > /tmp/sdk/emsdk.version
                         popd