Skip to content

Commit a30c92c

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Upgrade Alpine in nightly job
2 parents db65d22 + 66708de commit a30c92c

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

.github/workflows/nightly.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,21 +93,16 @@ jobs:
9393
ALPINE:
9494
if: inputs.run_alpine
9595
name: ALPINE_X64_ASAN_UBSAN_DEBUG_ZTS
96-
runs-on: ubuntu-22.04
96+
runs-on: ubuntu-24.04
9797
container:
98-
image: 'alpine:3.20.1'
98+
image: 'alpine:3.22'
9999
steps:
100100
- name: git checkout
101101
uses: actions/checkout@v5
102102
with:
103103
ref: ${{ inputs.branch }}
104104
- name: apk
105105
uses: ./.github/actions/apk
106-
- name: LLVM 17 (ASAN-only)
107-
# libclang_rt.asan-x86_64.a is provided by compiler-rt, and only for clang17:
108-
# https://pkgs.alpinelinux.org/contents?file=libclang_rt.asan-x86_64.a&path=&name=&branch=v3.20
109-
run: |
110-
apk add clang17 compiler-rt
111106
- name: System info
112107
run: |
113108
echo "::group::Show host CPU info"
@@ -122,8 +117,8 @@ jobs:
122117
configurationParameters: >-
123118
CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC"
124119
LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function"
125-
CC=clang-17
126-
CXX=clang++-17
120+
CC=clang-20
121+
CXX=clang++-20
127122
--enable-debug
128123
--enable-zts
129124
skipSlow: true # FIXME: This should likely include slow extensions

0 commit comments

Comments
 (0)