Skip to content

Commit 93104e5

Browse files
committed
Upgrade Alpine in push job
Closes GH-20090
1 parent d929f42 commit 93104e5

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

.github/workflows/push.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,14 @@ jobs:
4343
ALPINE:
4444
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
4545
name: ALPINE_X64_ASAN_UBSAN_DEBUG_ZTS
46-
runs-on: ubuntu-22.04
46+
runs-on: ubuntu-24.04
4747
container:
48-
image: 'alpine:3.20.1'
48+
image: 'alpine:3.22'
4949
steps:
5050
- name: git checkout
5151
uses: actions/checkout@v5
5252
- name: apk
5353
uses: ./.github/actions/apk
54-
- name: LLVM 17 (ASAN-only)
55-
# libclang_rt.asan-x86_64.a is provided by compiler-rt, and only for clang17:
56-
# https://pkgs.alpinelinux.org/contents?file=libclang_rt.asan-x86_64.a&path=&name=&branch=v3.20
57-
run: |
58-
apk add clang17 compiler-rt
5954
- name: System info
6055
run: |
6156
echo "::group::Show host CPU info"
@@ -70,8 +65,8 @@ jobs:
7065
configurationParameters: >-
7166
CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC"
7267
LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function"
73-
CC=clang-17
74-
CXX=clang++-17
68+
CC=clang-20
69+
CXX=clang++-20
7570
--enable-debug
7671
--enable-zts
7772
skipSlow: true # FIXME: This should likely include slow extensions

0 commit comments

Comments
 (0)