Skip to content

Commit aed58cb

Browse files
committed
Merge r1923271, r1923300, r1923302 from trunk:
CI: Add 64-bit ARM job to Linux workflow. See: https://github.blog/changelog/2025-01-16-linux-arm64-hosted-runners-now-available-for-free-in-public-repositories-public-preview/ Disable the arm64 job, it appears there are not enough runners. CI: Retry arm64 workflow with the correct label this time. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1924965 13f79535-47bb-0310-9956-ffa450edef68
1 parent bb26421 commit aed58cb

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

.github/workflows/linux.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ jobs:
5353
- name: Event MPM, all-modules, mod_cgid fdpassing
5454
config: --enable-mods-shared=reallyall --with-mpm=event --disable-cgi --enable-cgid-fdpassing
5555
# -------------------------------------------------------------------------
56+
- name: Shared MPMs, all-modules, 64-bit ARM
57+
config: --enable-mods-shared=reallyall --enable-mpms-shared=all
58+
os: ubuntu-24.04-arm
59+
# -------------------------------------------------------------------------
5660
- name: Event MPM, all-modules, mod_cgid w/o fdpassing
5761
config: --enable-mods-shared=reallyall --with-mpm=event --disable-cgi
5862
# -------------------------------------------------------------------------
@@ -240,7 +244,7 @@ jobs:
240244
# APR_VERSION=1.7.3
241245
# APU_VERSION=1.6.3
242246
# APU_CONFIG="--with-crypto --with-ldap"
243-
runs-on: ubuntu-latest
247+
runs-on: ${{ matrix.os == '' && 'ubuntu-latest' || matrix.os }}
244248
timeout-minutes: 30
245249
env:
246250
NOTEST_CFLAGS: ${{ matrix.notest-cflags }}

0 commit comments

Comments
 (0)