Skip to content

Commit 1a32a2b

Browse files
adriwebadriweb
committed
fix CI and update deps
1 parent f835d80 commit 1a32a2b

File tree

2 files changed

+47
-82
lines changed

2 files changed

+47
-82
lines changed

‎.github/workflows/branch.yml

+19-38
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ on:
88

99
env:
1010
AUTOTESTER_LIBS_GROUP: ${{github.workspace}}/toolchain/clibs.8xg
11-
AUTOTESTER_ROM: ${{github.workspace}}/secrets/84pce_515_53.rom
11+
AUTOTESTER_ROM: ${{github.workspace}}/secrets/83pce_515_530.rom
1212
CEDEV: ${{github.workspace}}/CEdev
1313
CEDEV_BIN: ${{github.workspace}}/CEdev/bin
1414
CEDEV_EXAMPLES: ${{github.workspace}}/CEdev/examples
1515
CEDEV_TEST: ${{github.workspace}}/toolchain/test
1616
CEMU_PATH: ${{github.workspace}}/CEmu
1717
FASMG_DOMAIN: https://flatassembler.net
1818
FASMG_PATH: ${{github.workspace}}/fasmg
19-
HOST_DOMAIN: https://jacobly.com
2019
SECRETS_PATH: ${{github.workspace}}/secrets
2120
TOOLCHAIN_PATH: ${{github.workspace}}/toolchain
2221

@@ -32,39 +31,31 @@ jobs:
3231
- nul: /dev/null
3332
- runs-on: macos-latest
3433
fasmg: /source/macos/x64/fasmg
34+
ez80-bins-suffix: macOS_arm
3535
- runs-on: windows-latest
3636
fasmg: /fasmg.exe
37+
ez80-bins-suffix: windows
3738
env: "env:"
3839
exe: .exe
3940
nul: nul
4041
ldflags: LDFLAGS="-static-libgcc -static-libstdc++ -static"
4142
- runs-on: ubuntu-20.04
43+
ez80-bins-suffix: ubuntu
4244
fasmg: /fasmg.x64
4345
runs-on: ${{matrix.runs-on}}
4446
steps:
4547
- name: Prepare Build Environment
4648
run: cmake -E echo >> $${{matrix.env}}GITHUB_PATH ${{env.CEDEV_BIN}}
4749

48-
- name: Download ez80-clang
49-
id: ez80-clang
50+
- name: Download ez80-clang and ez80-link
51+
id: ez80-bins
5052
uses: carlosperate/[email protected]
5153
with:
52-
file-url: ${{env.HOST_DOMAIN}}/artifact?repo=llvm-project&branch=z80&file=ez80-clang${{matrix.exe}}-${{matrix.runs-on}}Release
54+
file-url: https://github.com/CE-Programming/llvm-project/releases/download/nightly/ez80-clang-link_${{matrix.ez80-bins-suffix}}_nightly.zip
5355
- name: Extract ez80-clang
5456
uses: DuckSoft/[email protected]
5557
with:
56-
pathSource: ${{steps.ez80-clang.outputs.file-path}}
57-
pathTarget: ${{env.CEDEV_BIN}}
58-
59-
- name: Download ez80-link
60-
id: ez80-link
61-
uses: carlosperate/[email protected]
62-
with:
63-
file-url: ${{env.HOST_DOMAIN}}/artifact?repo=llvm-project&branch=z80&file=ez80-link${{matrix.exe}}-${{matrix.runs-on}}Release
64-
- name: Extract ez80-link
65-
uses: DuckSoft/[email protected]
66-
with:
67-
pathSource: ${{steps.ez80-link.outputs.file-path}}
58+
pathSource: ${{steps.ez80-bins.outputs.file-path}}
6859
pathTarget: ${{env.CEDEV_BIN}}
6960

7061
- name: Download Fasmg Download Page
@@ -94,7 +85,7 @@ jobs:
9485
run: cmake -E copy fasmg${{matrix.fasmg}} ${{env.CEDEV_BIN}}/fasmg${{matrix.exe}}
9586

9687
- name: Checkout CEmu
97-
uses: actions/checkout@v3
88+
uses: actions/checkout@v4
9889
with:
9990
repository: ${{github.repository_owner}}/CEmu
10091
ref: latest-stable
@@ -117,7 +108,7 @@ jobs:
117108
fasmg ${{matrix.nul}} ${{matrix.nul}}
118109
119110
- name: Checkout Toolchain
120-
uses: actions/checkout@v3
111+
uses: actions/checkout@v4
121112
with:
122113
path: ${{env.TOOLCHAIN_PATH}}
123114
submodules: recursive
@@ -145,7 +136,7 @@ jobs:
145136
run: make -j4 -C ${{env.CEDEV_TEST}} COMPRESSED=${{matrix.compressed}} V=1
146137

147138
- name: Upload Test Build Artifacts
148-
uses: actions/upload-artifact@v2
139+
uses: actions/upload-artifact@v4
149140
if: "contains(github.event.head_commit.message, 'upload')"
150141
with:
151142
name: tests-${{runner.os}}-${{matrix.compressed}}
@@ -157,27 +148,18 @@ jobs:
157148
run: make -j4 -C ${{env.CEDEV_EXAMPLES}} COMPRESSED=${{matrix.compressed}} V=1
158149

159150
- name: Upload Example Build Artifacts
160-
uses: actions/upload-artifact@v2
151+
uses: actions/upload-artifact@v4
161152
if: "contains(github.event.head_commit.message, 'upload')"
162153
with:
163154
name: examples-${{runner.os}}-${{matrix.compressed}}
164155
path: ${{env.CEDEV_EXAMPLES}}
165156

166-
- name: Download Secrets
167-
id: download-secrets
168-
uses: carlosperate/[email protected]
169-
with:
170-
file-url: ${{env.HOST_DOMAIN}}/${{github.repository_owner}}/secrets
171-
location: ${{env.SECRETS_PATH}}
172-
- name: Decrypt Secrets
173-
env:
174-
KEY: ${{secrets.SYMMETRIC_KEY_256}}
175-
run: openssl enc -d -aes-256-cbc -iv a581c6a54a2b51143fecad6794deb32a -K "$${{matrix.env}}KEY" -in ${{steps.download-secrets.outputs.file-path}} -out ${{env.SECRETS_PATH}}/secrets.7z
176-
- name: Extract Secrets
177-
uses: DuckSoft/[email protected]
157+
- name: Download CI test secrets
158+
uses: actions/checkout@v4
178159
with:
179-
pathSource: ${{env.SECRETS_PATH}}/secrets.7z
180-
pathTarget: ${{env.SECRETS_PATH}}
160+
repository: "CE-Programming/ci-test-secrets"
161+
token: ${{ secrets.GH_PAT_CI_SECRETS }}
162+
path: "secrets"
181163

182164
- name: Test Examples
183165
if: runner.os != 'Windows'
@@ -230,13 +212,12 @@ jobs:
230212
runs-on: ubuntu-latest
231213
steps:
232214
- name: Install Documentation Dependencies
233-
if: runner.os == 'Linux'
234215
run: |
235216
sudo apt-get install -y doxygen
236217
cmake -E echo >> $${{matrix.env}}GITHUB_PATH $${{matrix.env}}HOME/.local/bin
237218
238219
- name: Checkout Toolchain
239-
uses: actions/checkout@v3
220+
uses: actions/checkout@v4
240221
with:
241222
path: ${{env.TOOLCHAIN_PATH}}
242223
persist-credentials: false
@@ -248,6 +229,6 @@ jobs:
248229
- name: Build Website Documentation
249230
run: make -C ${{env.TOOLCHAIN_PATH}} docs
250231
- name: Disable Jekyll
251-
run: cmake -E touch ${{env.TOOLCHAIN_PATH}}/docs/build/html/.nojekyll
232+
run: touch ${{env.TOOLCHAIN_PATH}}/docs/build/html/.nojekyll
252233
- name: Remove .pickle files
253234
run: find ${{env.TOOLCHAIN_PATH}}/docs/build/ -name '*.pickle' -delete

‎.github/workflows/make.yml

+28-44
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@ on:
99

1010
env:
1111
AUTOTESTER_LIBS_GROUP: ${{github.workspace}}/toolchain/clibs.8xg
12-
AUTOTESTER_ROM: ${{github.workspace}}/secrets/84pce_515_53.rom
12+
AUTOTESTER_ROM: ${{github.workspace}}/secrets/83pce_515_530.rom
1313
CEDEV: ${{github.workspace}}/CEdev
1414
CEDEV_BIN: ${{github.workspace}}/CEdev/bin
1515
CEDEV_EXAMPLES: ${{github.workspace}}/CEdev/examples
1616
CEDEV_TEST: ${{github.workspace}}/toolchain/test
1717
CEMU_PATH: ${{github.workspace}}/CEmu
1818
FASMG_DOMAIN: https://flatassembler.net
1919
FASMG_PATH: ${{github.workspace}}/fasmg
20-
HOST_DOMAIN: https://jacobly.com
2120
SECRETS_PATH: ${{github.workspace}}/secrets
2221
TOOLCHAIN_PATH: ${{github.workspace}}/toolchain
2322

@@ -31,42 +30,34 @@ jobs:
3130
- nul: /dev/null
3231
- runs-on: macos-latest
3332
fasmg: /source/macos/x64/fasmg
33+
ez80-bins-suffix: macOS_arm
3434
install-output-ext: "dmg"
3535
- runs-on: windows-latest
3636
fasmg: /fasmg.exe
37+
ez80-bins-suffix: windows
3738
env: "env:"
3839
exe: .exe
3940
nul: nul
4041
ldflags: LDFLAGS="-static-libgcc -static-libstdc++ -static"
4142
install-output-ext: "zip"
4243
- runs-on: ubuntu-20.04
44+
ez80-bins-suffix: ubuntu
4345
fasmg: /fasmg.x64
4446
install-output-ext: "tar.gz"
4547
runs-on: ${{matrix.runs-on}}
4648
steps:
4749
- name: Prepare Build Environment
4850
run: cmake -E echo >> $${{matrix.env}}GITHUB_PATH ${{env.CEDEV_BIN}}
4951

50-
- name: Download ez80-clang
51-
id: ez80-clang
52+
- name: Download ez80-clang and ez80-link
53+
id: ez80-bins
5254
uses: carlosperate/[email protected]
5355
with:
54-
file-url: ${{env.HOST_DOMAIN}}/artifact?repo=llvm-project&branch=z80&file=ez80-clang${{matrix.exe}}-${{matrix.runs-on}}Release
56+
file-url: https://github.com/CE-Programming/llvm-project/releases/download/nightly/ez80-clang-link_${{matrix.ez80-bins-suffix}}_nightly.zip
5557
- name: Extract ez80-clang
5658
uses: DuckSoft/[email protected]
5759
with:
58-
pathSource: ${{steps.ez80-clang.outputs.file-path}}
59-
pathTarget: ${{env.CEDEV_BIN}}
60-
61-
- name: Download ez80-link
62-
id: ez80-link
63-
uses: carlosperate/[email protected]
64-
with:
65-
file-url: ${{env.HOST_DOMAIN}}/artifact?repo=llvm-project&branch=z80&file=ez80-link${{matrix.exe}}-${{matrix.runs-on}}Release
66-
- name: Extract ez80-link
67-
uses: DuckSoft/[email protected]
68-
with:
69-
pathSource: ${{steps.ez80-link.outputs.file-path}}
60+
pathSource: ${{steps.ez80-bins.outputs.file-path}}
7061
pathTarget: ${{env.CEDEV_BIN}}
7162

7263
- name: Download Fasmg Download Page
@@ -96,7 +87,7 @@ jobs:
9687
run: cmake -E copy fasmg${{matrix.fasmg}} ${{env.CEDEV_BIN}}/fasmg${{matrix.exe}}
9788

9889
- name: Checkout CEmu
99-
uses: actions/checkout@v3
90+
uses: actions/checkout@v4
10091
with:
10192
repository: ${{github.repository_owner}}/CEmu
10293
ref: latest-stable
@@ -119,7 +110,7 @@ jobs:
119110
fasmg ${{matrix.nul}} ${{matrix.nul}}
120111
121112
- name: Checkout Toolchain
122-
uses: actions/checkout@v3
113+
uses: actions/checkout@v4
123114
with:
124115
path: ${{env.TOOLCHAIN_PATH}}
125116
submodules: recursive
@@ -197,19 +188,21 @@ jobs:
197188
cd ${{env.CEDEV}}/.. && 7z a -tzip CEdev-${{runner.os}}.${{matrix.install-output-ext}} CEdev
198189
199190
- name: Upload CEdev
200-
uses: actions/upload-artifact@v2
191+
uses: actions/upload-artifact@v4
201192
with:
202193
name: CEdev-${{runner.os}}
203194
path: CEdev-${{runner.os}}.${{matrix.install-output-ext}}
204195

205196
- name: Upload Libraries
206-
uses: actions/upload-artifact@v2
197+
if: runner.os == 'Linux'
198+
uses: actions/upload-artifact@v4
207199
with:
208200
name: clibs
209201
path: ${{env.AUTOTESTER_LIBS_GROUP}}
210202

211203
- name: Upload Libraries Zip
212-
uses: actions/upload-artifact@v2
204+
if: runner.os == 'Linux'
205+
uses: actions/upload-artifact@v4
213206
with:
214207
name: clibs_separately_in_zip
215208
path: ${{github.workspace}}/toolchain/clibs
@@ -231,7 +224,7 @@ jobs:
231224
run: cmake -E echo >> $${{matrix.env}}GITHUB_PATH ${{env.CEDEV_BIN}}
232225

233226
- name: Download CEdev
234-
uses: actions/download-artifact@v3
227+
uses: actions/download-artifact@v4
235228
with:
236229
name: CEdev-${{runner.os}}
237230
path: ${{github.workspace}}
@@ -251,7 +244,7 @@ jobs:
251244
252245
# checkout only for test files -- contents should not be used otherwise.
253246
- name: Checkout Toolchain
254-
uses: actions/checkout@v3
247+
uses: actions/checkout@v4
255248
with:
256249
path: ${{env.TOOLCHAIN_PATH}}
257250
persist-credentials: false
@@ -266,24 +259,15 @@ jobs:
266259
- name: Build Examples
267260
run: make -j4 -C ${{env.CEDEV_EXAMPLES}} COMPRESSED=${{matrix.compressed}} V=1
268261

269-
- name: Download Secrets
270-
id: download-secrets
271-
uses: carlosperate/[email protected]
272-
with:
273-
file-url: ${{env.HOST_DOMAIN}}/${{github.repository_owner}}/secrets
274-
location: ${{env.SECRETS_PATH}}
275-
- name: Decrypt Secrets
276-
env:
277-
KEY: ${{secrets.SYMMETRIC_KEY_256}}
278-
run: openssl enc -d -aes-256-cbc -iv a581c6a54a2b51143fecad6794deb32a -K "$${{matrix.env}}KEY" -in ${{steps.download-secrets.outputs.file-path}} -out ${{env.SECRETS_PATH}}/secrets.7z
279-
- name: Extract Secrets
280-
uses: DuckSoft/[email protected]
262+
- name: Download CI test secrets
263+
uses: actions/checkout@v4
281264
with:
282-
pathSource: ${{env.SECRETS_PATH}}/secrets.7z
283-
pathTarget: ${{env.SECRETS_PATH}}
265+
repository: "CE-Programming/ci-test-secrets"
266+
token: ${{ secrets.GH_PAT_CI_SECRETS }}
267+
path: "secrets"
284268

285269
- name: Download Libraries
286-
uses: actions/download-artifact@v3
270+
uses: actions/download-artifact@v4
287271
with:
288272
name: clibs
289273
path: ${{env.TOOLCHAIN_PATH}}
@@ -343,7 +327,7 @@ jobs:
343327
cmake -E echo >> $${{matrix.env}}GITHUB_PATH $${{matrix.env}}HOME/.local/bin
344328
345329
- name: Checkout Toolchain
346-
uses: actions/checkout@v3
330+
uses: actions/checkout@v4
347331
with:
348332
path: ${{env.TOOLCHAIN_PATH}}
349333
persist-credentials: false
@@ -380,22 +364,22 @@ jobs:
380364

381365
steps:
382366
- name: Download CEdev Linux
383-
uses: actions/download-artifact@v3
367+
uses: actions/download-artifact@v4
384368
with:
385369
name: CEdev-Linux
386370
path: ${{github.workspace}}
387371
- name: Download CEdev Windows
388-
uses: actions/download-artifact@v3
372+
uses: actions/download-artifact@v4
389373
with:
390374
name: CEdev-Windows
391375
path: ${{github.workspace}}
392376
- name: Download CEdev macOS
393-
uses: actions/download-artifact@v3
377+
uses: actions/download-artifact@v4
394378
with:
395379
name: CEdev-macOS
396380
path: ${{github.workspace}}
397381
- name: Download CE Libraries
398-
uses: actions/download-artifact@v3
382+
uses: actions/download-artifact@v4
399383
with:
400384
name: clibs
401385
path: ${{github.workspace}}

0 commit comments

Comments
 (0)