Skip to content

Commit 77408dd

Browse files
ChinYikMingChinYikMing
committed
Remove redundant sdl
1 parent 7a21c7e commit 77408dd

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

‎.github/workflows/deploy-wasm.yml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
branches:
1111
- master
1212
repository_dispatch: # listening to rv32emu-prebuilt events
13-
types: [deploy_wasm, deploy_system_wasm]
13+
types: [deploy_user_wasm, deploy_system_wasm]
1414

1515
jobs:
1616
wasm-system-deploy:
@@ -24,7 +24,7 @@ jobs:
2424
- name: install-dependencies
2525
run: |
2626
sudo apt-get update -q=2
27-
sudo apt-get install -q=2 libsdl2-dev libsdl2-mixer-dev device-tree-compiler
27+
sudo apt-get install -q=2 device-tree-compiler
2828
- name: Verify if the JS or HTML files has been modified
2929
id: changed-files
3030
uses: tj-actions/changed-files@v46
@@ -58,11 +58,11 @@ jobs:
5858
run: |
5959
make artifact
6060
# Hack Cloudflare 403 Forbidden on GitHub Runner for Doom artifact download
61-
#wget --header="User-Agent: Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:122.0) Gecko/20100101 Firefox/122.0" \
62-
# --header="Referer: https://www.doomworld.com/" \
63-
# --header="Accept-Language: en-US,en;q=0.9" \
64-
# -O build/shareware_doom_iwad.zip \
65-
# "https://www.doomworld.com/3ddownloads/ports/shareware_doom_iwad.zip"
61+
wget --header="User-Agent: Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:122.0) Gecko/20100101 Firefox/122.0" \
62+
--header="Referer: https://www.doomworld.com/" \
63+
--header="Accept-Language: en-US,en;q=0.9" \
64+
-O build/shareware_doom_iwad.zip \
65+
"https://www.doomworld.com/3ddownloads/ports/shareware_doom_iwad.zip"
6666
unzip -d build/ build/shareware_doom_iwad.zip
6767
- name: build with emcc and move application files to /tmp
6868
if: ${{ steps.changed-files.outputs.any_modified == 'true' ||
@@ -84,7 +84,7 @@ jobs:
8484
uses: actions/checkout@v4
8585
with:
8686
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal access token.
87-
repository: sysprog21/rv32emu-demo
87+
repository: ChinYikMing/rv32emu-demo
8888
- name: Create local changes
8989
if: ${{ steps.changed-files.outputs.any_modified == 'true' ||
9090
github.event_name == 'workflow_dispatch' ||
@@ -111,11 +111,11 @@ jobs:
111111
(github.event_name == 'repository_dispatch' && github.event.action == 'deploy_system_wasm') }}
112112
uses: ad-m/github-push-action@master
113113
with:
114-
repository: sysprog21/rv32emu-demo
114+
repository: ChinYikMing/rv32emu-demo
115115
github_token: ${{ secrets.RV32EMU_DEMO_TOKEN }}
116116
branch: main
117117
wasm-user-deploy:
118-
needs: wasm-system-deploy # to run jobs sequentially since two jobs operate on same reposity: rv32emu-demo
118+
needs: wasm-system-deploy # run jobs sequentially since two jobs operate on same reposity: rv32emu-demo
119119
if: always() # ensures wasm-user-deploy runs regardless of the outcome or condition of wasm-system-deploy
120120
runs-on: ubuntu-latest
121121
steps:
@@ -139,7 +139,7 @@ jobs:
139139
- name: install emcc
140140
if: ${{ steps.changed-files.outputs.any_modified == 'true' ||
141141
github.event_name == 'workflow_dispatch' ||
142-
(github.event_name == 'repository_dispatch' && github.event.action == 'deploy_wasm') }}
142+
(github.event_name == 'repository_dispatch' && github.event.action == 'deploy_user_wasm') }}
143143
run: |
144144
git clone https://github.com/emscripten-core/emsdk.git
145145
cd emsdk
@@ -154,16 +154,16 @@ jobs:
154154
run: |
155155
make artifact
156156
# Hack Cloudflare 403 Forbidden on GitHub Runner for Doom artifact download
157-
#wget --header="User-Agent: Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:122.0) Gecko/20100101 Firefox/122.0" \
158-
# --header="Referer: https://www.doomworld.com/" \
159-
# --header="Accept-Language: en-US,en;q=0.9" \
160-
# -O build/shareware_doom_iwad.zip \
161-
# "https://www.doomworld.com/3ddownloads/ports/shareware_doom_iwad.zip"
157+
wget --header="User-Agent: Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:122.0) Gecko/20100101 Firefox/122.0" \
158+
--header="Referer: https://www.doomworld.com/" \
159+
--header="Accept-Language: en-US,en;q=0.9" \
160+
-O build/shareware_doom_iwad.zip \
161+
"https://www.doomworld.com/3ddownloads/ports/shareware_doom_iwad.zip"
162162
unzip -d build/ build/shareware_doom_iwad.zip
163163
- name: build with emcc and move application files to /tmp
164164
if: ${{ steps.changed-files.outputs.any_modified == 'true' ||
165165
github.event_name == 'workflow_dispatch' ||
166-
(github.event_name == 'repository_dispatch' && github.event.action == 'deploy_wasm') }}
166+
(github.event_name == 'repository_dispatch' && github.event.action == 'deploy_user_wasm') }}
167167
run: |
168168
make CC=emcc ENABLE_SDL=1
169169
mkdir /tmp/rv32emu-demo
@@ -177,15 +177,15 @@ jobs:
177177
- name: Check out the rv32emu-demo repo
178178
if: ${{ steps.changed-files.outputs.any_modified == 'true' ||
179179
github.event_name == 'workflow_dispatch' ||
180-
(github.event_name == 'repository_dispatch' && github.event.action == 'deploy_wasm') }}
180+
(github.event_name == 'repository_dispatch' && github.event.action == 'deploy_user_wasm') }}
181181
uses: actions/checkout@v4
182182
with:
183183
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal access token.
184-
repository: sysprog21/rv32emu-demo
184+
repository: ChinYikMing/rv32emu-demo
185185
- name: Create local changes
186186
if: ${{ steps.changed-files.outputs.any_modified == 'true' ||
187187
github.event_name == 'workflow_dispatch' ||
188-
(github.event_name == 'repository_dispatch' && github.event.action == 'deploy_wasm') }}
188+
(github.event_name == 'repository_dispatch' && github.event.action == 'deploy_user_wasm') }}
189189
run: |
190190
mv /tmp/rv32emu-demo/index.html .
191191
mv /tmp/rv32emu-demo/coi-serviceworker.min.js .
@@ -196,7 +196,7 @@ jobs:
196196
- name: Commit files
197197
if: ${{ steps.changed-files.outputs.any_modified == 'true' ||
198198
github.event_name == 'workflow_dispatch' ||
199-
(github.event_name == 'repository_dispatch' && github.event.action == 'deploy_wasm') }}
199+
(github.event_name == 'repository_dispatch' && github.event.action == 'deploy_user_wasm') }}
200200
run: |
201201
git config --local user.email "github-actions[bot]@users.noreply.github.com"
202202
git config --local user.name "github-actions[bot]"
@@ -205,9 +205,9 @@ jobs:
205205
- name: Push changes
206206
if: ${{ steps.changed-files.outputs.any_modified == 'true' ||
207207
github.event_name == 'workflow_dispatch' ||
208-
(github.event_name == 'repository_dispatch' && github.event.action == 'deploy_wasm') }}
208+
(github.event_name == 'repository_dispatch' && github.event.action == 'deploy_user_wasm') }}
209209
uses: ad-m/github-push-action@master
210210
with:
211-
repository: sysprog21/rv32emu-demo
211+
repository: ChinYikMing/rv32emu-demo
212212
github_token: ${{ secrets.RV32EMU_DEMO_TOKEN }}
213213
branch: main

0 commit comments

Comments
 (0)