Skip to content

Commit bbdf249

Browse files
gizmoguygizmoguy
authored
Merge pull request #12 from faucetsdn/trixie
Add debian trixie
2 parents fee0ab8 + 89595a2 commit bbdf249

2 files changed

Lines changed: 40 additions & 94 deletions

File tree

‎.github/workflows/release-debian.yml‎

Lines changed: 20 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,11 @@ jobs:
1717
strategy:
1818
matrix:
1919
include:
20-
- distro: "debian"
21-
release: "buster"
22-
arch: "amd64"
23-
- distro: "debian"
24-
release: "bullseye"
25-
arch: "amd64"
2620
- distro: "debian"
2721
release: "bookworm"
2822
arch: "amd64"
29-
- distro: "ubuntu"
30-
release: "focal"
23+
- distro: "debian"
24+
release: "trixie"
3125
arch: "amd64"
3226
- distro: "ubuntu"
3327
release: "jammy"
@@ -74,22 +68,6 @@ jobs:
7468
strategy:
7569
matrix:
7670
include:
77-
- distro: "debian"
78-
release: "buster"
79-
image: "buster"
80-
arch: "armv7"
81-
- distro: "debian"
82-
release: "buster"
83-
image: "buster"
84-
arch: "aarch64"
85-
- distro: "debian"
86-
release: "bullseye"
87-
image: "bullseye"
88-
arch: "armv7"
89-
- distro: "debian"
90-
release: "bullseye"
91-
image: "bullseye"
92-
arch: "aarch64"
9371
- distro: "debian"
9472
release: "bookworm"
9573
image: "bookworm"
@@ -98,14 +76,16 @@ jobs:
9876
release: "bookworm"
9977
image: "bookworm"
10078
arch: "aarch64"
101-
- distro: "ubuntu"
102-
release: "focal"
103-
image: "ubuntu20.04"
104-
arch: "armv7"
105-
- distro: "ubuntu"
106-
release: "focal"
107-
image: "ubuntu20.04"
108-
arch: "aarch64"
79+
- distro: "debian"
80+
release: "trixie"
81+
image: "none"
82+
arch: "none"
83+
base_image: --platform=linux/arm/v7 arm32v7/debian:trixie
84+
- distro: "debian"
85+
release: "trixie"
86+
image: "none"
87+
arch: "none"
88+
base_image: --platform=linux/arm64 arm64v8/debian:trixie
10989
- distro: "ubuntu"
11090
release: "jammy"
11191
image: "ubuntu22.04"
@@ -114,31 +94,24 @@ jobs:
11494
release: "jammy"
11595
image: "ubuntu22.04"
11696
arch: "aarch64"
117-
- distro: "raspbian"
118-
release: "buster"
119-
image: "buster"
120-
arch: "armv7"
121-
- distro: "raspbian"
122-
release: "buster"
123-
image: "buster"
124-
arch: "aarch64"
125-
- distro: "raspbian"
126-
release: "bullseye"
127-
image: "bullseye"
97+
- distro: "ubuntu"
98+
release: "noble"
99+
image: "ubuntu24.04"
128100
arch: "armv7"
129-
- distro: "raspbian"
130-
release: "bullseye"
131-
image: "bullseye"
101+
- distro: "ubuntu"
102+
release: "noble"
103+
image: "ubuntu24.04"
132104
arch: "aarch64"
133105
steps:
134106
- name: Checkout repo
135107
uses: actions/checkout@v4
136-
- uses: uraimo/run-on-arch-action@v2.8.1
108+
- uses: uraimo/run-on-arch-action@v3
137109
name: Build artifact
138110
id: build
139111
with:
140112
arch: ${{ matrix.arch }}
141113
distro: ${{ matrix.image }}
114+
base_image: ${{ matrix.base_image }}
142115
shell: /bin/bash
143116
install: |
144117
apt-get update

‎.github/workflows/test-debian.yml‎

Lines changed: 20 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,11 @@ jobs:
1212
strategy:
1313
matrix:
1414
include:
15-
- distro: "debian"
16-
release: "buster"
17-
arch: "amd64"
18-
- distro: "debian"
19-
release: "bullseye"
20-
arch: "amd64"
2115
- distro: "debian"
2216
release: "bookworm"
2317
arch: "amd64"
24-
- distro: "ubuntu"
25-
release: "focal"
18+
- distro: "debian"
19+
release: "trixie"
2620
arch: "amd64"
2721
- distro: "ubuntu"
2822
release: "jammy"
@@ -56,22 +50,6 @@ jobs:
5650
strategy:
5751
matrix:
5852
include:
59-
- distro: "debian"
60-
release: "buster"
61-
image: "buster"
62-
arch: "armv7"
63-
- distro: "debian"
64-
release: "buster"
65-
image: "buster"
66-
arch: "aarch64"
67-
- distro: "debian"
68-
release: "bullseye"
69-
image: "bullseye"
70-
arch: "armv7"
71-
- distro: "debian"
72-
release: "bullseye"
73-
image: "bullseye"
74-
arch: "aarch64"
7553
- distro: "debian"
7654
release: "bookworm"
7755
image: "bookworm"
@@ -80,14 +58,16 @@ jobs:
8058
release: "bookworm"
8159
image: "bookworm"
8260
arch: "aarch64"
83-
- distro: "ubuntu"
84-
release: "focal"
85-
image: "ubuntu20.04"
86-
arch: "armv7"
87-
- distro: "ubuntu"
88-
release: "focal"
89-
image: "ubuntu20.04"
90-
arch: "aarch64"
61+
- distro: "debian"
62+
release: "trixie"
63+
image: "none"
64+
arch: "none"
65+
base_image: --platform=linux/arm/v7 arm32v7/debian:trixie
66+
- distro: "debian"
67+
release: "trixie"
68+
image: "none"
69+
arch: "none"
70+
base_image: --platform=linux/arm64 arm64v8/debian:trixie
9171
- distro: "ubuntu"
9272
release: "jammy"
9373
image: "ubuntu22.04"
@@ -96,31 +76,24 @@ jobs:
9676
release: "jammy"
9777
image: "ubuntu22.04"
9878
arch: "aarch64"
99-
- distro: "raspbian"
100-
release: "buster"
101-
image: "buster"
102-
arch: "armv7"
103-
- distro: "raspbian"
104-
release: "buster"
105-
image: "buster"
106-
arch: "aarch64"
107-
- distro: "raspbian"
108-
release: "bullseye"
109-
image: "bullseye"
79+
- distro: "ubuntu"
80+
release: "noble"
81+
image: "ubuntu24.04"
11082
arch: "armv7"
111-
- distro: "raspbian"
112-
release: "bullseye"
113-
image: "bullseye"
83+
- distro: "ubuntu"
84+
release: "noble"
85+
image: "ubuntu24.04"
11486
arch: "aarch64"
11587
steps:
11688
- name: Checkout repo
11789
uses: actions/checkout@v4
118-
- uses: uraimo/run-on-arch-action@v2.8.1
90+
- uses: uraimo/run-on-arch-action@v3
11991
name: Build artifact
12092
id: build
12193
with:
12294
arch: ${{ matrix.arch }}
12395
distro: ${{ matrix.image }}
96+
base_image: ${{ matrix.base_image }}
12497
shell: /bin/bash
12598
install: |
12699
apt-get update

0 commit comments

Comments
 (0)