Skip to content

Commit 5f71e10

Browse files
committed
PR Builds: Add Debian Trixie for testing
1 parent c5eaf98 commit 5f71e10

File tree

2 files changed

+32
-13
lines changed

2 files changed

+32
-13
lines changed

.github/workflows/debian.yml

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,40 @@ on:
3232

3333
jobs:
3434

35+
generate-matrix:
36+
runs-on: ubuntu-latest
37+
outputs:
38+
matrix: ${{ steps.set-matrix.outputs.matrix }}
39+
steps:
40+
- id: set-matrix
41+
run: |
42+
CODENAME="${{ inputs.codename }}"
43+
if [ "$CODENAME" = "trixie" ]; then
44+
OS_MATRIX='[
45+
{ "description": "Linux (x86_64)", "architecture": ["amd64", "linux/amd64"], "platform": "x11" },
46+
{ "description": "Raspberry Pi 3/4/5 & Zero 2 (arm64)", "architecture": ["arm64", "linux/arm64"], "platform": "rpi" }
47+
]'
48+
else
49+
OS_MATRIX='[
50+
{ "description": "Linux (x86_64)", "architecture": ["amd64", "linux/amd64"], "platform": "x11" },
51+
{ "description": "Raspberry Pi 1 & Zero 1 (armv6)", "architecture": ["armv6", "linux/arm/v6"], "platform": "rpi" },
52+
{ "description": "Raspberry Pi 2 (armv7)", "architecture": ["armv7", "linux/arm/v7"], "platform": "rpi" },
53+
{ "description": "Raspberry Pi 3/4/5 & Zero 2 (arm64)", "architecture": ["arm64", "linux/arm64"], "platform": "rpi" }
54+
]'
55+
fi
56+
57+
TARGET_LOOKUP='[{ "arm64": "arm64", "armv6": "armv6l", "armv7": "armv7l" }]'
58+
MATRIX="{\"os\": $(jq -c . <<< \"$OS_MATRIX\"), \"target_lookup\": $(jq -c . <<< \"$TARGET_LOOKUP\")}"
59+
echo "matrix=$MATRIX" >> $GITHUB_OUTPUT
60+
3561
debian:
36-
name: ${{ matrix.os.description }}
62+
name: Build ${{ matrix.os.description }}
63+
needs: generate-matrix
3764
runs-on: ${{ matrix.os.architecture[0] == 'amd64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }}
3865
strategy:
3966
fail-fast: false
40-
matrix:
41-
os: [
42-
{ description: Linux (x86_64), architecture: [ amd64, linux/amd64 ], platform: x11 },
43-
{ description: Raspberry Pi 1 & Zero 1 (armv6), architecture: [ armv6, linux/arm/v6 ], platform: rpi },
44-
{ description: Raspberry Pi 2 (armv7), architecture: [ armv7, linux/arm/v7 ], platform: rpi },
45-
{ description: Raspberry Pi 3/4/5 & Zero 2 (arm64), architecture: [ arm64, linux/arm64 ], platform: rpi }
46-
]
47-
target_lookup: [
48-
{ 'arm64': 'arm64', 'armv6': 'armv6l', 'armv7': 'armv7l' }
49-
]
50-
67+
matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
68+
5169
steps:
5270
- name: ⬇ Checkout
5371
uses: actions/checkout@v4

.github/workflows/push_pull.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ jobs:
2323
matrix:
2424
debian: [
2525
{ codename: [ 'bullseye', 'Bullseye' ] },
26-
{ codename: [ 'bookworm', 'Bookworm (Testing)' ] }
26+
{ codename: [ 'bookworm', 'Bookworm' ] },
27+
{ codename: [ 'trixie', 'Trixie (Testing)' ] }
2728
]
2829
uses: ./.github/workflows/debian.yml
2930
secrets: inherit

0 commit comments

Comments
 (0)