Skip to content

Commit 6b3c472

Browse files
SanderMullerclaude
andcommitted
Point the 8.6 turbo builds at sources that have 8.6
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
1 parent 0019961 commit 6b3c472

1 file changed

Lines changed: 11 additions & 3 deletions

File tree

‎.github/workflows/phar.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,8 @@ jobs:
339339
# packages ZTS PHP (neither ppa:ondrej/php nor Alpine); setup-php
340340
# provides thread-safe builds. No musl ZTS for the same packaging
341341
# reason.
342-
container: ${{ matrix.target.family == 'gnu' && format('ghcr.io/phpstan/turbo-build:gnu-php{0}', matrix.php-version) || matrix.target.container }}
342+
# alpine 3.24 carries php83 to php85, php86 only exists in edge so far
343+
container: ${{ matrix.target.family == 'gnu' && format('ghcr.io/phpstan/turbo-build:gnu-php{0}', matrix.php-version) || (matrix.target.family == 'musl' && matrix.php-version == '8.6' && 'alpine:edge') || matrix.target.container }}
343344
timeout-minutes: 30
344345

345346
env:
@@ -555,11 +556,14 @@ jobs:
555556
fetch-depth: 0
556557

557558
- name: "Start the Alpine build container"
559+
env:
560+
# alpine 3.24 carries php83 to php85, php86 only exists in edge so far
561+
ALPINE_IMAGE: ${{ matrix.php-version == '8.6' && 'alpine:edge' || 'alpine:3.24' }}
558562
run: |
559563
docker run -d --name alpine-build \
560564
-v "$PWD:/work" -w /work \
561565
-e PHP_MINOR -e COMPOSER_VERSION -e COMPOSER_PHAR_SHA256 \
562-
alpine:3.24 sleep 7200
566+
"$ALPINE_IMAGE" sleep 7200
563567
564568
- name: "Install PHP and build tools"
565569
run: |
@@ -862,6 +866,8 @@ jobs:
862866
vs: "vs17"
863867
- php-version: "8.5"
864868
vs: "vs17"
869+
- php-version: "8.6"
870+
vs: "vs18"
865871

866872
steps:
867873
- name: "Checkout"
@@ -895,8 +901,10 @@ jobs:
895901
INFIX=$([ "$MATRIX_TS" = "zts" ] && echo "" || echo "-nts")
896902
PACK="php-devel-pack-$FULL$INFIX-Win32-$MATRIX_VS-x64.zip"
897903
echo "devel pack: $PACK"
904+
# betas and RCs are published under downloads/qa, released versions are not
898905
curl -fsSLo devel-pack.zip "https://windows.php.net/downloads/releases/$PACK" \
899-
|| curl -fsSLo devel-pack.zip "https://windows.php.net/downloads/releases/archives/$PACK"
906+
|| curl -fsSLo devel-pack.zip "https://windows.php.net/downloads/releases/archives/$PACK" \
907+
|| curl -fsSLo devel-pack.zip "https://windows.php.net/downloads/qa/$PACK"
900908
unzip -q devel-pack.zip -d /c/php-devel
901909
902910
git clone -q https://github.com/php/php-sdk-binary-tools.git /c/php-sdk

0 commit comments

Comments
 (0)