php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4' into PHP-8.5

Browse Source 
* PHP-8.4:
  Upgrade Alpine in nightly job
This commit is contained in:
Arnaud Le Blanc
2025-10-07 11:00:10 +02:00
parent 294e408ca2 d929f42eb2
commit e886159059
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/actions/apk/action.yml vendored
View File

@@ -7,6 +7,9 @@ runs:
set -x set -x
OPCACHE_TLS_TESTS_DEPS="clang gcc binutils-gold lld" OPCACHE_TLS_TESTS_DEPS="clang gcc binutils-gold lld"
# compiler-rt provides libclang_rt.asan-x86_64.a for clang20
# https://pkgs.alpinelinux.org/contents?file=libclang_rt.asan-x86_64.a&path=&name=&branch=v3.22
ASAN_DEPS="clang20 compiler-rt"
apk update -q apk update -q
apk add \ apk add \
@@ -52,8 +55,9 @@ runs:
net-snmp-dev \ net-snmp-dev \
openldap-dev \ openldap-dev \
unixodbc-dev \ unixodbc-dev \
postgresql14-dev \ postgresql-dev \
tzdata \ tzdata \
musl-locales \ musl-locales \
musl-locales-lang \ musl-locales-lang \
$OPCACHE_TLS_TESTS_DEPS $OPCACHE_TLS_TESTS_DEPS \
$ASAN_DEPS

13
.github/workflows/nightly.yml vendored
View File

@@ -93,9 +93,9 @@ jobs:
ALPINE: ALPINE:
if: inputs.run_alpine if: inputs.run_alpine
name: ALPINE_X64_ASAN_UBSAN_DEBUG_ZTS name: ALPINE_X64_ASAN_UBSAN_DEBUG_ZTS
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
container: container:
image: 'alpine:3.20.1' image: 'alpine:3.22'
steps: steps:
- name: git checkout - name: git checkout
uses: actions/checkout@v5 uses: actions/checkout@v5
@@ -103,11 +103,6 @@ jobs:
ref: ${{ inputs.branch }} ref: ${{ inputs.branch }}
- name: apk - name: apk
uses: ./.github/actions/apk uses: ./.github/actions/apk
- name: LLVM 17 (ASAN-only)
# libclang_rt.asan-x86_64.a is provided by compiler-rt, and only for clang17:
# https://pkgs.alpinelinux.org/contents?file=libclang_rt.asan-x86_64.a&path=&name=&branch=v3.20
run: |
apk add clang17 compiler-rt
- name: System info - name: System info
run: | run: |
echo "::group::Show host CPU info" echo "::group::Show host CPU info"
@@ -122,8 +117,8 @@ jobs:
configurationParameters: >- configurationParameters: >-
CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC" CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC"
LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function" LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function"
CC=clang-17 CC=clang-20
CXX=clang++-17 CXX=clang++-20
--enable-debug --enable-debug
--enable-zts --enable-zts
skipSlow: true # FIXME: This should likely include slow extensions skipSlow: true # FIXME: This should likely include slow extensions