Skip to content

Commit 469a6b0

Browse files
committed
patches: Fix build issue for current install candidates.
PR 1086 should have been using asterisk_pr_if instead of asterisk_pr_unconditional. In addition to the daily DAHDI CI, a daily Asterisk CI has been added to more quickly catch issues like this when new releases come out.
1 parent 37e48e7 commit 469a6b0

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

.github/workflows/linux-next.yml .github/workflows/daily.yml

+21-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: linux-next daily CI
1+
name: Daily CI
22

33
on:
44
# Retest daily to catch kernel breakage ASAP
@@ -37,3 +37,23 @@ jobs:
3737
run: |
3838
./phreaknet.sh make
3939
GIT_REPO_PATH=${GITHUB_WORKSPACE} KSRC=/usr/src/linux-next phreaknet dahdi --drivers
40+
fedora-42:
41+
runs-on: ubuntu-24.04
42+
name: Fedora 42
43+
container: fedora:42
44+
steps:
45+
- uses: actions/checkout@v4
46+
- name: Build DAHDI and Asterisk
47+
run: |
48+
./phreaknet.sh make
49+
GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --autokvers --drivers --devmode --sip
50+
fedora-42-master:
51+
runs-on: ubuntu-24.04
52+
name: Fedora 42 Master
53+
container: fedora:42
54+
steps:
55+
- uses: actions/checkout@v4
56+
- name: Build DAHDI and Asterisk
57+
run: |
58+
./phreaknet.sh make
59+
GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --autokvers --drivers --devmode --sip --version=master

phreaknet.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2440,7 +2440,7 @@ phreak_patches() { # $1 = $PATCH_DIR, $2 = $AST_SRC_DIR
24402440
## Merged, not yet in a release version (use asterisk_pr_if, e.g. asterisk_pr_if 1234 220300 210800 201300)
24412441
if [ $AST_MAJOR_VER -lt 23 ]; then
24422442
# Underlying problem code was removed entirely in master, so patch only needed for release versions
2443-
asterisk_pr_unconditional 1086 220300 210800 201300 # Fix for Fedora 42 (old style definitions for libdb)
2443+
asterisk_pr_if 1086 220300 210800 201300 # Fix for Fedora 42 (old style definitions for libdb)
24442444
fi
24452445

24462446
## Unmerged patches: remove or switch to asterisk_pr_if once merged

0 commit comments

Comments
 (0)