From b3308c7602a6312a690a12d045775ccf7cd27975 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Mon, 20 Jan 2025 16:35:28 +0000 Subject: [PATCH 1/2] Disable Windows during development. REVERT ME --- .github/workflows/windows.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ac9cb119a8a..3e861189b3f 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -8,13 +8,6 @@ on: - STATUS - CHANGES - changes-entries/* - pull_request: - branches: [ "trunk", "2.4.x" ] - paths-ignore: - - 'docs/**' - - STATUS - - CHANGES - - changes-entries/* jobs: build: From 586d7eb24d4d043866c6c2494e1da76c82d032a0 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Mon, 20 Jan 2025 16:50:46 +0000 Subject: [PATCH 2/2] Try selective override of runs-on. --- .github/workflows/linux.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index d4436b86e6a..c897cae9464 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -50,6 +50,10 @@ jobs: - name: Shared MPMs, all-modules config: --enable-mods-shared=reallyall --enable-mpms-shared=all # ------------------------------------------------------------------------- + - name: Shared MPMs, all-modules + config: --enable-mods-shared=reallyall --enable-mpms-shared=all + os: ubuntu-22.04-arm64 + # ------------------------------------------------------------------------- - name: Event MPM, all-modules, mod_cgid only config: --enable-mods-shared=reallyall --with-mpm=event --disable-cgi # ------------------------------------------------------------------------- @@ -312,7 +316,7 @@ jobs: APU_CONFIG="--without-crypto" pkgs: subversion # ------------------------------------------------------------------------- - runs-on: ubuntu-latest + runs-on: ${{ matrix.os == '' && 'ubuntu-latest' || matrix.os }} timeout-minutes: 30 env: NOTEST_CFLAGS: ${{ matrix.notest-cflags }}