Skip to content

Commit 8490af7

Browse files
committed
ci: enable ARMv6 Forky builds/tests
The Raspbian Forky suite is availalable now.
1 parent 784a052 commit 8490af7

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

.github/workflows/dietpi-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
'"-m 74 -d 7", "-m 74 -d 8", "-m 74 -d 9",'\
7474
'"-m 75 -a 1 -d 7", "-m 75 -a 2 -d 7", "-m 75 -a 3 -d 7", "-m 75 -a 10 -d 7",'\
7575
'"-m 75 -a 1 -d 8", "-m 75 -a 2 -d 8", "-m 75 -a 3 -d 8", "-m 75 -a 10 -d 8", "-m 75 -a 11 -d 8",'\
76-
'"-m 75 -a 2 -d 9", "-m 75 -a 3 -d 9", "-m 75 -a 10 -d 9", "-m 75 -a 11 -d 9",'\
76+
'"-m 75 -a 1 -d 9", "-m 75 -a 2 -d 9", "-m 75 -a 3 -d 9", "-m 75 -a 10 -d 9", "-m 75 -a 11 -d 9",'\
7777
'"-m 76.1 -d 7", "-m 76.1 -d 8", "-m 76.1 -d 9",'\
7878
'"-m 76.2 -d 7", "-m 76.2 -d 8", "-m 76.2 -d 9",'\
7979
'"-m 77 -d 7", "-m 77 -d 8", "-m 77 -d 9",'\
@@ -111,7 +111,7 @@ jobs:
111111
elif [ "${{ github.event.inputs.buildargs }}" = 'rpi' ]
112112
then
113113
echo buildargs=[\
114-
'"-m 1 -d 7 -e all", "-m 1 -d 8 -e all",'\
114+
'"-m 1 -d 7 -e all", "-m 1 -d 8 -e all", "-m 1 -d 9 -e all",'\
115115
'"-m 2 -d 7 -e all", "-m 2 -d 8 -e all", "-m 2 -d 9 -e all",'\
116116
'"-m 4 -d 7 -e all", "-m 4 -d 8 -e all", "-m 4 -d 9 -e all",'\
117117
'"-m 5 -d 7 -e all", "-m 5 -d 8 -e all", "-m 5 -d 9 -e all"]' >> "$GITHUB_OUTPUT"
@@ -120,7 +120,7 @@ jobs:
120120
echo buildargs=[\
121121
'"-m 75 -a 1 -d 7", "-m 75 -a 2 -d 7", "-m 75 -a 3 -d 7", "-m 75 -a 10 -d 7",'\
122122
'"-m 75 -a 1 -d 8", "-m 75 -a 2 -d 8", "-m 75 -a 3 -d 8", "-m 75 -a 10 -d 8", "-m 75 -a 11 -d 8",'\
123-
'"-m 75 -a 2 -d 9", "-m 75 -a 3 -d 9", "-m 75 -a 10 -d 9", "-m 75 -a 11 -d 9"]' >> "$GITHUB_OUTPUT"
123+
'"-m 75 -a 1 -d 9", "-m 75 -a 2 -d 9", "-m 75 -a 3 -d 9", "-m 75 -a 10 -d 9", "-m 75 -a 11 -d 9"]' >> "$GITHUB_OUTPUT"
124124
elif [ "${{ github.event.inputs.buildargs }}" = 'pc' ]
125125
then
126126
echo buildargs=[\

.github/workflows/dietpi-software-build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ jobs:
7070
- { arch: armv6l, name: amiberry-lite }
7171
- { arch: armv6l, name: gzdoom }
7272
- { arch: armv7l, name: gzdoom }
73-
- { arch: armv6l, dist: forky }
7473
fail-fast: false
7574
name: "${{ matrix.name }} - ${{ matrix.arch }} - ${{ matrix.dist }}"
7675
runs-on: ${{ matrix.arch == 'x86_64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }}

.github/workflows/dietpi-software.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ jobs:
6464
dist: ${{ fromJson(needs.prep.outputs.dist) }}
6565
exclude:
6666
- { arch: riscv64, dist: bookworm }
67-
- { arch: armv6l, dist: forky }
6867
fail-fast: false
6968
name: "${{ matrix.arch }} - ${{ matrix.dist }} - ${{ github.event.inputs.soft }}"
7069
runs-on: ${{ matrix.arch == 'x86_64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }}

0 commit comments

Comments
 (0)