Skip to content

Commit a463ede

Browse files
committed
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4: Upgrade Alpine in push job
2 parents e886159 + 93104e5 commit a463ede

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
@@ -35,19 +35,14 @@ jobs:
3535
ALPINE:
3636
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
3737
name: ALPINE_X64_ASAN_UBSAN_DEBUG_ZTS
38-
runs-on: ubuntu-22.04
38+
runs-on: ubuntu-24.04
3939
container:
40-
image: 'alpine:3.20.1'
40+
image: 'alpine:3.22'
4141
steps:
4242
- name: git checkout
4343
uses: actions/checkout@v5
4444
- name: apk
4545
uses: ./.github/actions/apk
46-
- name: LLVM 17 (ASAN-only)
47-
# libclang_rt.asan-x86_64.a is provided by compiler-rt, and only for clang17:
48-
# https://pkgs.alpinelinux.org/contents?file=libclang_rt.asan-x86_64.a&path=&name=&branch=v3.20
49-
run: |
50-
apk add clang17 compiler-rt
5146
- name: System info
5247
run: |
5348
echo "::group::Show host CPU info"
@@ -62,8 +57,8 @@ jobs:
6257
configurationParameters: >-
6358
CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC"
6459
LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function"
65-
CC=clang-17
66-
CXX=clang++-17
60+
CC=clang-20
61+
CXX=clang++-20
6762
--enable-debug
6863
--enable-zts
6964
skipSlow: true # FIXME: This should likely include slow extensions

0 commit comments

Comments
 (0)