Skip to content

Commit 1e914dc

Browse files
committed
Work with new runners, and add tests
1 parent bf391dc commit 1e914dc

File tree

1 file changed

+59
-4
lines changed

1 file changed

+59
-4
lines changed

.github/workflows/build.yml

Lines changed: 59 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Upload Artifact
3434
uses: actions/upload-artifact@v4
3535
with:
36-
name: tools-x64-win
36+
name: tools-win-${{ runner.arch }}
3737
path: |
3838
bin/picotool-*-x64-win.zip
3939
bin/pico-sdk-tools-*-x64-win.zip
@@ -75,7 +75,7 @@ jobs:
7575
- name: Upload Artifact
7676
uses: actions/upload-artifact@v4
7777
with:
78-
name: tools-mac-arm64
78+
name: tools-mac-${{ runner.arch }}
7979
path: |
8080
bin/picotool-*-mac.zip
8181
bin/pico-sdk-tools-*-mac.zip
@@ -110,7 +110,7 @@ jobs:
110110
- name: Upload Artifact
111111
uses: actions/upload-artifact@v4
112112
with:
113-
name: tools-mac-x64
113+
name: tools-mac-${{ runner.arch }}
114114
path: |
115115
bin/openocd-*-mac.zip
116116
bin/riscv-toolchain-*.zip
@@ -169,7 +169,7 @@ jobs:
169169
# os: [[self-hosted, linux, x64], [self-hosted, linux, arm64]]
170170
strategy:
171171
matrix:
172-
os: [ubuntu-22.04, [self-hosted, linux, arm64]]
172+
os: [ubuntu-22.04, [self-hosted, linux, arm64, bookworm, 8G]]
173173
runs-on: ${{ matrix.os }}
174174

175175
steps:
@@ -201,4 +201,59 @@ jobs:
201201
bin/openocd-*-lin.tar.gz
202202
bin/riscv-toolchain-*-lin.tar.gz
203203
204+
test_binaries:
205+
name: Test Binaries
206+
needs: [build_linux, build_macos_arm64, build_windows]
207+
strategy:
208+
fail-fast: false
209+
matrix:
210+
os: [macos_latest, windows_latest, [self-hosted, linux, arm64, bookworm_desktop], [self-hosted, linux, arm64, trixie_desktop]]
211+
runs-on: ${{ matrix.os }}
212+
steps:
213+
- name: Download build (Windows)
214+
if: ${{ runner.os == 'Windows' }}
215+
uses: actions/download-artifact@v5
216+
with:
217+
name: tools-x64-win
218+
- name: Download build (MacOS Arm64)
219+
if: ${{ runner.os == 'macOS' }}
220+
uses: actions/download-artifact@v5
221+
with:
222+
name: tools-mac-arm64
223+
- name: Download build (Linux)
224+
if: ${{ runner.os == 'Linux' }}
225+
uses: actions/download-artifact@v5
226+
with:
227+
name: tools-lin-${{ runner.arch }}
228+
229+
- name: Extract build (zip)
230+
if: ${{ runner.os == 'Windows' }} || ${{ runner.os == 'macOS' }}
231+
shell: bash # Windows only has unzip in bash shell
232+
run: |
233+
unzip openocd*.zip
234+
ls
235+
unzip pico-sdk-tools*.zip
236+
ls
237+
unzip picotool*.zip
238+
ls
239+
unzip riscv-toolchain*.zip
240+
ls
241+
- name: Extract build (tar.gz)
242+
if: ${{ runner.os == 'Linux' }}
243+
run: |
244+
tar -xvf openocd*.tar.gz
245+
ls
246+
tar -xvf pico-sdk-tools*.tar.gz
247+
ls
248+
tar -xvf picotool*.tar.gz
249+
ls
250+
tar -xvf riscv-toolchain*.tar.gz
251+
ls
204252
253+
- name: Test everything runs
254+
run: |
255+
./picotool/picotool version
256+
./pioasm/pioasm --version
257+
./openocd --version
258+
./bin/riscv32-unknown-elf-gcc --version
259+
./bin/riscv32-unknown-elf-gdb --version

0 commit comments

Comments
 (0)