CI: refine deploy wasm logic

Author: ChinYikMing

.github/workflows/deploy-wasm.yml

@@ -10,13 +10,13 @@ on:
     branches:
       - master
   repository_dispatch:   # listening to rv32emu-prebuilt events
-    types: [deploy_wasm]
+    types: [deploy_wasm, deploy_system_wasm]
 
 jobs:
   wasm-system-deploy:
     if: github.event.pull_request.merged == true ||
         github.event_name == 'workflow_dispatch' ||
-        github.event_name == 'repository_dispatch'
+        github.event_name == 'repository_dispatch' && github.event.action == 'deploy_system_wasm'
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
@@ -43,7 +43,7 @@ jobs:
       - name: install emcc
         if: ${{ steps.changed-files.outputs.any_modified == 'true' ||
             github.event_name == 'workflow_dispatch' ||
-            github.event_name == 'repository_dispatch' }}
+            (github.event_name == 'repository_dispatch' && github.event.action == 'deploy_system_wasm') }}
         run: |
             git clone https://github.com/emscripten-core/emsdk.git
             cd emsdk
@@ -58,16 +58,16 @@ jobs:
         run: |
               make artifact
               # Hack Cloudflare 403 Forbidden on GitHub Runner for Doom artifact download
-              wget --header="User-Agent: Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:122.0) Gecko/20100101 Firefox/122.0" \
-                   --header="Referer: https://www.doomworld.com/" \
-                   --header="Accept-Language: en-US,en;q=0.9" \
-                   -O build/shareware_doom_iwad.zip \
-                   "https://www.doomworld.com/3ddownloads/ports/shareware_doom_iwad.zip"
+              #wget --header="User-Agent: Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:122.0) Gecko/20100101 Firefox/122.0" \
+              #     --header="Referer: https://www.doomworld.com/" \
+              #     --header="Accept-Language: en-US,en;q=0.9" \
+              #     -O build/shareware_doom_iwad.zip \
+              #     "https://www.doomworld.com/3ddownloads/ports/shareware_doom_iwad.zip"
               unzip -d build/ build/shareware_doom_iwad.zip
       - name: build with emcc and move application files to /tmp
         if: ${{ steps.changed-files.outputs.any_modified == 'true' ||
             github.event_name == 'workflow_dispatch' ||
-            github.event_name == 'repository_dispatch' }}
+            (github.event_name == 'repository_dispatch' && github.event.action == 'deploy_system_wasm') }}
         run: |
             make CC=emcc ENABLE_SYSTEM=1 ENABLE_SDL=1 INITRD_SIZE=32 -j
             mkdir /tmp/rv32emu-system-demo
@@ -80,15 +80,15 @@ jobs:
       - name: Check out the rv32emu-system-demo repo
         if: ${{ steps.changed-files.outputs.any_modified == 'true' ||
             github.event_name == 'workflow_dispatch' ||
-            github.event_name == 'repository_dispatch' }}
+            (github.event_name == 'repository_dispatch' && github.event.action == 'deploy_system_wasm') }}
         uses: actions/checkout@v4
         with:
           persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal access token.
           repository: sysprog21/rv32emu-demo
       - name: Create local changes
         if: ${{ steps.changed-files.outputs.any_modified == 'true' ||
             github.event_name == 'workflow_dispatch' ||
-            github.event_name == 'repository_dispatch' }}
+            (github.event_name == 'repository_dispatch' && github.event.action == 'deploy_system_wasm') }}
         run: |
             mkdir -p system
             mv /tmp/rv32emu-system-demo/index.html ./system
@@ -99,7 +99,7 @@ jobs:
       - name: Commit files
         if: ${{ steps.changed-files.outputs.any_modified == 'true' ||
             github.event_name == 'workflow_dispatch' ||
-            github.event_name == 'repository_dispatch' }}
+            (github.event_name == 'repository_dispatch' && github.event.action == 'deploy_system_wasm') }}
         run: |
             git config --local user.email "github-actions[bot]@users.noreply.github.com"
             git config --local user.name "github-actions[bot]"
@@ -108,17 +108,15 @@ jobs:
       - name: Push changes
         if: ${{ steps.changed-files.outputs.any_modified == 'true' ||
             github.event_name == 'workflow_dispatch' ||
-            github.event_name == 'repository_dispatch' }}
+            (github.event_name == 'repository_dispatch' && github.event.action == 'deploy_system_wasm') }}
         uses: ad-m/github-push-action@master
         with:
           repository: sysprog21/rv32emu-demo
           github_token: ${{ secrets.RV32EMU_DEMO_TOKEN }}
           branch: main
   wasm-user-deploy:
-    needs: wasm-system-deploy # to run jobs sequentially
-    if: github.event.pull_request.merged == true ||
-        github.event_name == 'workflow_dispatch' ||
-        github.event_name == 'repository_dispatch'
+    needs: wasm-system-deploy # to run jobs sequentially since two jobs operate on same reposity: rv32emu-demo
+    if: always() # ensures wasm-user-deploy runs regardless of the outcome or condition of wasm-system-deploy
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
@@ -141,7 +139,7 @@ jobs:
       - name: install emcc
         if: ${{ steps.changed-files.outputs.any_modified == 'true' ||
             github.event_name == 'workflow_dispatch' ||
-            github.event_name == 'repository_dispatch' }}
+            (github.event_name == 'repository_dispatch' && github.event.action == 'deploy_wasm') }}
         run: |
             git clone https://github.com/emscripten-core/emsdk.git
             cd emsdk
@@ -156,16 +154,16 @@ jobs:
         run: |
               make artifact
               # Hack Cloudflare 403 Forbidden on GitHub Runner for Doom artifact download
-              wget --header="User-Agent: Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:122.0) Gecko/20100101 Firefox/122.0" \
-                   --header="Referer: https://www.doomworld.com/" \
-                   --header="Accept-Language: en-US,en;q=0.9" \
-                   -O build/shareware_doom_iwad.zip \
-                   "https://www.doomworld.com/3ddownloads/ports/shareware_doom_iwad.zip"
+              #wget --header="User-Agent: Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:122.0) Gecko/20100101 Firefox/122.0" \
+              #     --header="Referer: https://www.doomworld.com/" \
+              #     --header="Accept-Language: en-US,en;q=0.9" \
+              #     -O build/shareware_doom_iwad.zip \
+              #     "https://www.doomworld.com/3ddownloads/ports/shareware_doom_iwad.zip"
               unzip -d build/ build/shareware_doom_iwad.zip
       - name: build with emcc and move application files to /tmp
         if: ${{ steps.changed-files.outputs.any_modified == 'true' ||
             github.event_name == 'workflow_dispatch' ||
-            github.event_name == 'repository_dispatch' }}
+            (github.event_name == 'repository_dispatch' && github.event.action == 'deploy_wasm') }}
         run: |
             make CC=emcc ENABLE_SDL=1
             mkdir /tmp/rv32emu-demo
@@ -179,15 +177,15 @@ jobs:
       - name: Check out the rv32emu-demo repo
         if: ${{ steps.changed-files.outputs.any_modified == 'true' ||
             github.event_name == 'workflow_dispatch' ||
-            github.event_name == 'repository_dispatch' }}
+            (github.event_name == 'repository_dispatch' && github.event.action == 'deploy_wasm') }}
         uses: actions/checkout@v4
         with:
           persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal access token.
           repository: sysprog21/rv32emu-demo
       - name: Create local changes
         if: ${{ steps.changed-files.outputs.any_modified == 'true' ||
             github.event_name == 'workflow_dispatch' ||
-            github.event_name == 'repository_dispatch' }}
+            (github.event_name == 'repository_dispatch' && github.event.action == 'deploy_wasm') }}
         run: |
             mv /tmp/rv32emu-demo/index.html .
             mv /tmp/rv32emu-demo/coi-serviceworker.min.js .
@@ -198,7 +196,7 @@ jobs:
       - name: Commit files
         if: ${{ steps.changed-files.outputs.any_modified == 'true' ||
             github.event_name == 'workflow_dispatch' ||
-            github.event_name == 'repository_dispatch' }}
+            (github.event_name == 'repository_dispatch' && github.event.action == 'deploy_wasm') }}
         run: |
             git config --local user.email "github-actions[bot]@users.noreply.github.com"
             git config --local user.name "github-actions[bot]"
@@ -207,7 +205,7 @@ jobs:
       - name: Push changes
         if: ${{ steps.changed-files.outputs.any_modified == 'true' ||
             github.event_name == 'workflow_dispatch' ||
-            github.event_name == 'repository_dispatch' }}
+            (github.event_name == 'repository_dispatch' && github.event.action == 'deploy_wasm') }}
         uses: ad-m/github-push-action@master
         with:
           repository: sysprog21/rv32emu-demo