CI: Test without parallel build

InterLinked1 · Feb 21, 2025 · 01f7b7f · 01f7b7f
1 parent 9566922
commit 01f7b7f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 242 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches: [ master, dev ]
+    branches: [ master, dev, dahdidev ]
   pull_request:
     branches: [ master ]
   # Retest weekly to ensure nothing has broken
@@ -16,85 +16,6 @@ on:
 # kernel-devel mismatch has been detected. Package provides 6.12.0-0.rc0.20240918git4a39ac5b7d62, but running kernel is 6.8.0-1014-azure
 
 jobs:
-  dahdi-kernel-stable:
-    runs-on: ubuntu-24.04
-    name: DAHDI, stable kernel
-    container: debian:12
-    strategy:
-      fail-fast: false
-      matrix:
-        kernel_branch: [
-          'linux-4.14.y',
-          'linux-4.19.y',
-          'linux-5.4.y',
-          'linux-5.10.y',
-          'linux-5.15.y',
-          'linux-5.17.y',
-          'linux-5.18.y',
-          'linux-5.19.y',
-          'linux-6.1.y',
-          'linux-6.5.y',
-          'linux-6.6.y',
-          'linux-6.7.y',
-          'linux-6.8.y',
-          'linux-6.9.y',
-          'linux-6.10.y',
-          'linux-6.11.y',
-          'linux-rolling-lts',
-          'linux-rolling-stable'
-          ]
-    steps:
-     - name: Install packages
-       run: |
-          apt-get -y update
-          apt-get -y upgrade
-          apt-get -y install git gcc make perl-modules flex bison wget libssl-dev libelf-dev bc
-     - name: Clone kernel
-       run: |
-          cd /usr/src
-          git clone --depth 1 --branch ${{matrix.kernel_branch}} git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
-     - name: Build kernel
-       run: |
-          cd /usr/src/linux
-          make -j$(nproc) kernelversion
-          make -j$(nproc) x86_64_defconfig
-          make -j$(nproc) modules_prepare
-          make -j$(nproc)
-          make -j$(nproc) modules
-     - name: Checkout
-       uses: actions/checkout@v4
-     - name: Build DAHDI
-       run: |
-           ./phreaknet.sh make
-           GIT_REPO_PATH=${GITHUB_WORKSPACE} KSRC=/usr/src/linux phreaknet dahdi --drivers
-  dahdi-kernel-mainline:
-    runs-on: ubuntu-24.04
-    name: DAHDI, mainline kernel
-    container: debian:12
-    steps:
-     - name: Install packages
-       run: |
-          apt-get -y update
-          apt-get -y upgrade
-          apt-get -y install git gcc make perl-modules flex bison wget libssl-dev libelf-dev bc
-     - name: Clone kernel
-       run: |
-          cd /usr/src
-          git clone --depth 1 git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
-     - name: Build kernel
-       run: |
-          cd /usr/src/linux
-          make -j$(nproc) kernelversion
-          make -j$(nproc) x86_64_defconfig
-          make -j$(nproc) modules_prepare
-          make -j$(nproc)
-          make -j$(nproc) modules
-     - name: Checkout
-       uses: actions/checkout@v4
-     - name: Build DAHDI
-       run: |
-           ./phreaknet.sh make
-           GIT_REPO_PATH=${GITHUB_WORKSPACE} KSRC=/usr/src/linux phreaknet dahdi --drivers
   dahdi-kernel-next:
     runs-on: ubuntu-24.04
     name: DAHDI, next kernel
@@ -123,163 +44,3 @@ jobs:
        run: |
            ./phreaknet.sh make
            GIT_REPO_PATH=${GITHUB_WORKSPACE} KSRC=/usr/src/linux-next phreaknet dahdi --drivers
-  ubuntu-latest:
-    runs-on: ubuntu-24.04
-    name: Ubuntu 24.04
-    steps:
-     - name: Checkout
-       uses: actions/checkout@v4
-     - name: Build DAHDI and Asterisk
-       run: |
-          sudo ./phreaknet.sh make
-          sudo GIT_REPO_PATH=${{ github.workspace }} phreaknet install --fast --dahdi --drivers --devmode --sip
-  ubuntu-stable:
-    runs-on: ubuntu-22.04
-    name: Ubuntu 22.04
-    steps:
-     - name: Checkout
-       uses: actions/checkout@v4
-     - name: Build DAHDI and Asterisk
-       run: |
-          sudo ./phreaknet.sh make
-          # Environment variables don't carry through with sudo
-          sudo GIT_REPO_PATH=${{ github.workspace }} phreaknet install --fast --dahdi --drivers --devmode --sip
-  debian-stable-asterisk-lts:
-    runs-on: ubuntu-24.04
-    name: Debian 12, Asterisk 20
-    container: debian:12
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build DAHDI and Asterisk
-        run: |
-          ./phreaknet.sh make
-          GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --drivers --sip --testsuite --version=20
-      - name: Run tests
-        run: |
-          phreaknet runtests
-  debian-stable-asterisk-latest:
-    runs-on: ubuntu-24.04
-    name: Debian 12
-    container: debian:12
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build DAHDI and Asterisk
-        run: |
-          ./phreaknet.sh make
-          GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --drivers --sip --testsuite
-      - name: Run tests
-        run: |
-          phreaknet runtests
-  debian-stable-asterisk-latest-unpatched:
-    runs-on: ubuntu-24.04
-    name: Debian 12, vanilla Asterisk
-    container: debian:12
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build DAHDI and Asterisk
-        run: |
-          ./phreaknet.sh make
-          GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --devmode --sip --vanilla --user=asterisk
-  debian-stable-asterisk-master:
-    runs-on: ubuntu-24.04
-    name: Debian 12, Asterisk master branch
-    container: debian:12
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build DAHDI and Asterisk
-        run: |
-          ./phreaknet.sh make
-          GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --drivers --sip --testsuite --version=master
-  debian-dahdi-minimal:
-    runs-on: ubuntu-24.04
-    name: Debian 12, without libpri and libss7
-    container: debian:12
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build DAHDI (without libpri or libss7) and Asterisk (chan_dahdi)
-        run: |
-          ./phreaknet.sh make
-          GIT_REPO_PATH=${GITHUB_WORKSPACE} INSTALL_LIBPRI=0 INSTALL_LIBSS7=0 phreaknet install --fast --dahdi --autokvers --drivers --devmode --lightweight --vanilla
-  alpine-linux:
-    runs-on: ubuntu-24.04
-    name: Alpine Linux
-    container: alpine:latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build DAHDI and Asterisk
-        run: |
-          ./phreaknet.sh make
-          GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --autokvers --drivers --devmode
-  fedora-42:
-    runs-on: ubuntu-24.04
-    name: Fedora 42
-    container: fedora:42
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build DAHDI and Asterisk
-        run: |
-          ./phreaknet.sh make
-          GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --autokvers --drivers --devmode
-  alma-9-5:
-    runs-on: ubuntu-24.04
-    name: Alma Linux 9.5
-    container: almalinux:9.5
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build DAHDI and Asterisk
-        run: |
-          ./phreaknet.sh make
-          GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --autokvers --drivers --devmode
-  rocky-9:
-    runs-on: ubuntu-24.04
-    name: Rocky Linux 9.3
-    container: rockylinux:9.3
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build DAHDI and Asterisk
-        run: |
-          ./phreaknet.sh make
-          GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --autokvers --drivers --devmode
-  rocky-8:
-    runs-on: ubuntu-24.04
-    name: Rocky Linux 8.9
-    container: rockylinux:8.9
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build DAHDI and Asterisk
-        run: |
-          ./phreaknet.sh make
-          GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --autokvers --drivers --devmode
-  opensuse:
-    runs-on: ubuntu-24.04
-    name: openSUSE Tumbleweed
-    container: opensuse/tumbleweed
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build Asterisk
-        run: |
-          ./phreaknet.sh make
-          GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --devmode --sip
-  archlinux:
-    runs-on: ubuntu-24.04
-    name: Arch Linux
-    container: archlinux:latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build DAHDI and Asterisk
-        run: |
-          ./phreaknet.sh make
-          GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --drivers --devmode --sip
-# FreeBSD CI disabled since libuuid headers can't get installed in CI?
-#  freebsd-14:
-#    runs-on: ubuntu-24.04
-#    name: FreeBSD
-#    steps:
-#      - uses: actions/checkout@v4
-#      - name: Build Asterisk
-#        uses: vmactions/freebsd-vm@v1
-#        with:
-#          usesh: true
-#          run: |
-#            ./phreaknet.sh make
-#            phreaknet install --fast --devmode --sip
diff --git a/phreaknet.sh b/phreaknet.sh
@@ -2012,7 +2012,7 @@ install_dahdi() {
 	fi
 
 	# if KSRC/KVERS env vars are set, they will automatically propagate to children
-	$AST_MAKE -j$(nproc) $DAHDI_CFLAGS
+	$AST_MAKE $DAHDI_CFLAGS
 	if [ $? -ne 0 ]; then
 		if [ -f drivers/dahdi/vpmadt032_loader/vpmadt032_x86_64.o_shipped ]; then
 			# If this is PHREAKSCRIPT-61, apply temporary workaround for newer kernels failing with:
@@ -2045,7 +2045,7 @@ install_dahdi() {
 			printf "COPY %s %s\n" drivers/dahdi/vpmadt032_loader/vpmadt032_${MY_DAHDI_ARCH}.o_shipped drivers/dahdi/vpmadt032_loader/vpmadt032_${MY_DAHDI_ARCH}.o
 			cp -n drivers/dahdi/vpmadt032_loader/vpmadt032_${MY_DAHDI_ARCH}.o_shipped drivers/dahdi/vpmadt032_loader/vpmadt032_${MY_DAHDI_ARCH}.o
 		fi
-		$AST_MAKE -j$(nproc) $DAHDI_CFLAGS
+		$AST_MAKE $DAHDI_CFLAGS
 	fi
 	if [ $? -ne 0 ]; then
 		die "DAHDI Linux compilation failed, aborting install"