Skip to content

Commit c3d74a9

Browse files
InterLinked1InterLinked1
committed
CI: Add builds for Debian 13.
1 parent 8188fbf commit c3d74a9

File tree

4 files changed

+45
-22
lines changed

4 files changed

+45
-22
lines changed

‎.github/workflows/daily-latest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
dahdi-kernel-next:
1313
runs-on: ubuntu-24.04
1414
name: DAHDI, next kernel
15-
container: debian:12
15+
container: debian:13
1616
steps:
1717
- name: Install packages
1818
run: |

‎.github/workflows/main-latest.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
dahdi-kernel-stable:
1717
runs-on: ubuntu-24.04
1818
name: DAHDI, stable kernel
19-
container: debian:12
19+
container: debian:13
2020
strategy:
2121
fail-fast: false
2222
matrix:
@@ -50,7 +50,7 @@ jobs:
5050
dahdi-kernel-mainline:
5151
runs-on: ubuntu-24.04
5252
name: DAHDI, mainline kernel
53-
container: debian:12
53+
container: debian:13
5454
steps:
5555
- name: Install packages
5656
run: |
@@ -78,7 +78,7 @@ jobs:
7878
dahdi-kernel-next:
7979
runs-on: ubuntu-24.04
8080
name: DAHDI, next kernel
81-
container: debian:12
81+
container: debian:13
8282
steps:
8383
- name: Install packages
8484
run: |

‎.github/workflows/main.yml‎

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ jobs:
1616
dahdi-kernel-stable:
1717
runs-on: ubuntu-24.04
1818
name: DAHDI, stable kernel
19+
# Note: The 5.19 kernel fails to compile under Debian 13, so we can continue using Debian 12.
20+
# The container OS doesn't really matter here as it's the compiled kernel version we care about,
21+
# i.e. build failures against the kernel, not a build failure of the kernel itself.
1922
container: debian:12
2023
strategy:
2124
fail-fast: false
@@ -57,7 +60,7 @@ jobs:
5760
dahdi-nonfatal-stable:
5861
runs-on: ubuntu-24.04
5962
name: DAHDI, nonfatal, stable kernel
60-
container: debian:12
63+
container: debian:13
6164
strategy:
6265
fail-fast: false
6366
matrix:
@@ -100,7 +103,7 @@ jobs:
100103
dahdi-nonfatal-mainline:
101104
runs-on: ubuntu-24.04
102105
name: DAHDI, nonfatal, mainline kernel
103-
container: debian:12
106+
container: debian:13
104107
steps:
105108
- name: Install packages
106109
run: |
@@ -133,7 +136,7 @@ jobs:
133136
dahdi-nonfatal-next:
134137
runs-on: ubuntu-24.04
135138
name: DAHDI, nonfatal, next kernel
136-
container: debian:12
139+
container: debian:13
137140
steps:
138141
- name: Install packages
139142
run: |
@@ -221,7 +224,20 @@ jobs:
221224
sudo ./phreaknet.sh make
222225
# Environment variables don't carry through with sudo
223226
sudo GIT_REPO_PATH=${{ github.workspace }} phreaknet install --fast --dahdi --drivers --devmode --sip
224-
debian-stable-asterisk-lts:
227+
debian-13-asterisk:
228+
runs-on: ubuntu-24.04
229+
name: Debian 13
230+
container: debian:13
231+
steps:
232+
- uses: actions/checkout@v4
233+
- name: Build DAHDI and Asterisk
234+
run: |
235+
./phreaknet.sh make
236+
GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --drivers --sip --testsuite
237+
- name: Run tests
238+
run: |
239+
phreaknet runtests
240+
debian-12-asterisk-lts:
225241
runs-on: ubuntu-24.04
226242
name: Debian 12, Asterisk 20
227243
container: debian:12
@@ -234,7 +250,7 @@ jobs:
234250
- name: Run tests
235251
run: |
236252
phreaknet runtests
237-
debian-stable-asterisk-latest:
253+
debian-12-asterisk-latest:
238254
runs-on: ubuntu-24.04
239255
name: Debian 12
240256
container: debian:12
@@ -247,17 +263,18 @@ jobs:
247263
- name: Run tests
248264
run: |
249265
phreaknet runtests
250-
debian-stable-asterisk-latest-unpatched:
266+
debian-13-asterisk-latest-unpatched:
251267
runs-on: ubuntu-24.04
252-
name: Debian 12, vanilla Asterisk
253-
container: debian:12
268+
name: Debian 13, vanilla Asterisk
269+
container: debian:13
254270
steps:
255271
- uses: actions/checkout@v4
256272
- name: Build DAHDI and Asterisk
257273
run: |
258274
./phreaknet.sh make
259275
GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --devmode --sip --vanilla --user=asterisk
260-
debian-stable-asterisk-master:
276+
# NOTE: wanpipe does not compile on Debian 13 yet
277+
debian-12-asterisk-master:
261278
runs-on: ubuntu-24.04
262279
name: Debian 12, wanpipe, Asterisk master
263280
container: debian:12
@@ -269,8 +286,8 @@ jobs:
269286
GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --drivers --wanpipe --sip --testsuite --version=master
270287
debian-dahdi-minimal:
271288
runs-on: ubuntu-24.04
272-
name: Debian 12, without libpri and libss7
273-
container: debian:12
289+
name: Debian 13, without libpri and libss7
290+
container: debian:13
274291
steps:
275292
- uses: actions/checkout@v4
276293
- name: Build DAHDI (without libpri or libss7) and Asterisk (chan_dahdi)

‎phreaknet.sh‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ AST_SOURCE_PARENT_DIR="/usr/src"
196196
AST_ALT_VER=""
197197
AST_MIN_PREFERRED_VER=20
198198
AST_DEFAULT_MAJOR_VER=22
199-
AST_NEXT_MAJOR_VER=23
199+
AST_NEXT_MAJOR_VER=24
200200
AST_MAJOR_VER=$AST_DEFAULT_MAJOR_VER
201201
AST_MM_VER=0
202202
AST_SOURCE_NAME="asterisk-${AST_DEFAULT_MAJOR_VER}-current"
@@ -274,7 +274,7 @@ FREEPBX_GUI=0
274274
GENERIC_HEADERS=0
275275
AUTOSET_KVERS=0
276276
EXTERNAL_CODECS=0
277-
RTPULSING=1 # Disabled temporarily, patches must be rebased
277+
RTPULSING=1
278278
HEARPULSING=1
279279
HAVE_COMPATIBLE_SPANDSP=1
280280
PACMAN_UPDATED=0 # Internal flag
@@ -972,9 +972,9 @@ install_prereq() {
972972
PREREQ_PACKAGES="$PREREQ_PACKAGES libnewt-dev dwarves"
973973
fi
974974
if [ "$1" = "1" ]; then
975-
PREREQ_PACKAGES="$PREREQ_PACKAGES curl subversion libcurl4-openssl-dev libvpb1"
975+
PREREQ_PACKAGES="$PREREQ_PACKAGES curl subversion libcurl4-openssl-dev"
976976
if [ "$ENHANCED_INSTALL" = "1" ]; then
977-
PREREQ_PACKAGES="$PREREQ_PACKAGES dnsutils bc mpg123 ntp tcpdump festival"
977+
PREREQ_PACKAGES="$PREREQ_PACKAGES dnsutils bc mpg123 tcpdump festival"
978978
fi
979979
if [ "$DEVMODE" = "1" ]; then
980980
PREREQ_PACKAGES="$PREREQ_PACKAGES xmlstarlet" # only needed in developer mode for doc validation.
@@ -1039,7 +1039,7 @@ install_prereq() {
10391039
if [ "$1" = "1" ]; then
10401040
PREREQ_PACKAGES="$PREREQ_PACKAGES curl subversion e2fsprogs-libuuid sqlite3 xmlstarlet libsysinfo"
10411041
if [ "$ENHANCED_INSTALL" = "1" ]; then
1042-
PREREQ_PACKAGES="$PREREQ_PACKAGES ntp tcpdump mpg123 bind-tools" # bind-tools for dig
1042+
PREREQ_PACKAGES="$PREREQ_PACKAGES tcpdump mpg123 bind-tools" # bind-tools for dig
10431043
fi
10441044
fi
10451045
else
@@ -1304,7 +1304,7 @@ run_testsuite_tests() {
13041304
cd $AST_SOURCE_PARENT_DIR/testsuite
13051305

13061306
# run manually for good measure, and so we get the full output
1307-
install_package "python3.11-venv"
1307+
# install_package "python3.11-venv" # Doesn't exist on Debian 13
13081308
./setupVenv.sh
13091309

13101310
run_testsuite_test "apps/assert"
@@ -2611,6 +2611,10 @@ phreak_patches() {
26112611
fi
26122612
}
26132613

2614+
universal_patches() {
2615+
asterisk_pr_if 1370 230000 220700 211200 201700 # test_res_prometheus compiler fixes
2616+
}
2617+
26142618
freebsd_port_patch() {
26152619
filename=$( basename $1 )
26162620
download_github_file "freebsd/freebsd-ports" "master" "$1" "$filename"
@@ -3145,6 +3149,8 @@ get_source() {
31453149
svn --non-interactive --trust-server-cert export https://svn.digium.com/svn/thirdparty/mp3/trunk addons/mp3
31463150
./contrib/scripts/get_mp3_source.sh
31473151

3152+
universal_patches
3153+
31483154
if [ "$EXTRA_FEATURES" = "1" ]; then
31493155
# Add PhreakNet patches
31503156
printf "%s\n" "Beginning custom patches..."
@@ -3529,7 +3535,7 @@ elif [ "$cmd" = "install" ]; then
35293535
get_source
35303536
# Install Pre-Reqs
35313537
if [ "$PAC_MAN" = "apt-get" ]; then
3532-
printf "%s %d" "libvpb1 libvpb1/countrycode string" "$AST_CC" | debconf-set-selections -v
3538+
printf "%s %d" "libvpb1/countrycode string" "$AST_CC" | debconf-set-selections -v
35333539
fi
35343540
./contrib/scripts/install_prereq install
35353541

0 commit comments

Comments
 (0)