ci: fix weird shit

julie-dujardin · Aug 3, 2024 · 5566afc · 5566afc
1 parent ab4da85
commit 5566afc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -198,11 +198,11 @@ jobs:
         run: |
           cp deploy/cloudflare-pages/* wasm32/
           # exclude the engine file from cloudflare pages because it's too big
-          engine_hash=($(sha256sum wasm32/index.side.wasm))
+          echo "engine_hash=($(sha256sum wasm32/index.side.wasm))" >> $GITHUB_ENV
           rm wasm32/index.side.wasm
           # ugly hack to force godot to pull the engine from another domain
-          build_type=${{ matrix.build_type }}
-          sed -i -e "s/{{{DIR}}}/${build_type}_${GODOT_VERSION}_${engine_hash[1]}/g" deploy/templates/readAsyncNew
+          echo "build_type=${{ matrix.build_type }}" >> $GITHUB_ENV
+          sed -e "s|{{{DIR}}}|${build_type}_${GODOT_VERSION}_${engine_hash[1]}|g" deploy/templates/readAsyncNew
           sed -e '/readAsync = (url, onload, onerror) => {/{r readAsyncNew' -e 'd;}' wasm32/index.js > _index.js
           mv _index.js wasm32/index.js
       - name: Publish to Cloudflare Pages

diff --git a/.github/workflows/compile_godot.yaml b/.github/workflows/compile_godot.yaml
@@ -258,13 +258,13 @@ jobs:
           name: templates-web-${{ env.GODOT_VERSION }}
       - name: Prepare Upload
         run: |
-          unzip templates-web-${{ env.GODOT_VERSION }}/web_dlink_release.zip -d release_files
+          unzip web_dlink_release.zip -d release_files
           mkdir release_engine
           mv release_files/godot.side.wasm release_engine/index.side.wasm
           release_hash=($(sha256sum release_engine/index.side.wasm))
           echo "RELEASE_HASH=${release_hash[1]}" >> $GITHUB_ENV
 
-          unzip templates-web-${{ env.GODOT_VERSION }}/web_dlink_debug.zip -d debug_files
+          unzip web_dlink_debug.zip -d debug_files
           mkdir debug_engine
           mv debug_files/godot.side.wasm debug_engine/index.side.wasm
           debug_hash=($(sha256sum debug_engine/index.side.wasm))
@@ -279,7 +279,7 @@ jobs:
           fi
           
       - name: Upload release engine to R2
-        if: env.UPLOAD_ENGINE == 'true'
+        if: ${{ env.UPLOAD_ENGINE == 'true' }}
         uses: jakejarvis/s3-sync-action@master
         with:
           args: --delete
@@ -293,7 +293,7 @@ jobs:
           DEST_DIR: release_${{ env.GODOT_VERSION }}_${{ env.RELEASE_HASH }}
 
       - name: Upload debug engine to R2
-        if: env.UPLOAD_ENGINE == 'true'
+        if: ${{ env.UPLOAD_ENGINE == 'true' }}
         uses: jakejarvis/s3-sync-action@master
         with:
           args: --delete