Skip to content

Commit 989c690

Browse files
authoredApr 16, 2025
Update build-php-unix.yml
1 parent dd095fa commit 989c690

File tree

1 file changed

+6
-23
lines changed

1 file changed

+6
-23
lines changed
 

‎.github/workflows/build-php-unix.yml

+6-23
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runner:
2121
- "ubuntu-latest"
2222
- "macos-13"
23-
- "ubuntu-20.04"
23+
- "ubuntu-24.04-arm"
2424
- "macos-14"
2525
combination:
2626
- minimal
@@ -52,10 +52,10 @@ jobs:
5252
echo "ARCH=x86_64" >> "$GITHUB_OUTPUT"
5353
echo "CMD=bin/spc-alpine-docker" >> "$GITHUB_OUTPUT"
5454
;;
55-
ubuntu-20.04)
55+
ubuntu-24.04-arm)
5656
echo "OS=linux" >> "$GITHUB_OUTPUT"
5757
echo "ARCH=aarch64" >> "$GITHUB_OUTPUT"
58-
echo CMD="SPC_USE_ARCH=aarch64 bin/spc-alpine-docker" >> "$GITHUB_OUTPUT"
58+
echo CMD="bin/spc-alpine-docker" >> "$GITHUB_OUTPUT"
5959
;;
6060
windows-2019)
6161
echo "OS=windows" >> "$GITHUB_OUTPUT"
@@ -82,7 +82,7 @@ jobs:
8282
ref: main
8383

8484
- name: "Setup PHP"
85-
if: matrix.runner != 'ubuntu-20.04'
85+
if: matrix.runner != 'ubuntu-24.04-arm' && matrix.runner != 'ubuntu-latest'
8686
uses: shivammathur/setup-php@v2
8787
with:
8888
php-version: 8.4
@@ -107,7 +107,7 @@ jobs:
107107
key: pack-lib-dependencies-${{ matrix.combination }}-${{ matrix.php-version }}-${{ matrix.runner }}
108108

109109
- name: "Install Dependencies"
110-
if: matrix.runner != 'ubuntu-20.04'
110+
if: matrix.runner != 'ubuntu-24.04-arm' && matrix.runner != 'ubuntu-latest'
111111
run: composer update -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist --no-dev
112112

113113
- run: ${{ steps.process-env.outputs.CMD }} doctor --auto-fix
@@ -122,9 +122,7 @@ jobs:
122122
run: |
123123
if [ "${{ steps.process-env.outputs.OS }}" = "linux" ]; then
124124
${{ steps.process-env.outputs.CMD }} install-pkg upx
125-
if [ "${{ steps.process-env.outputs.ARCH }}" = "x86_64" ]; then
126-
UPX=--with-upx-pack
127-
fi
125+
UPX=--with-upx-pack
128126
fi
129127
130128
${{ steps.process-env.outputs.CMD }} build --build-cli --build-micro --build-fpm ${{ steps.process-env.outputs.EXTENSIONS }} --debug $UPX
@@ -135,21 +133,6 @@ jobs:
135133
cp buildroot/bin/micro.sfx tmp_dist/
136134
cp buildroot/bin/php-fpm tmp_dist/
137135
138-
# UPX outside for linux-aarch64
139-
if [ "${{ steps.process-env.outputs.OS }}-${{ steps.process-env.outputs.ARCH }}" = "linux-aarch64" ]; then
140-
mkdir -p upx-x86_64
141-
cd upx-x86_64
142-
curl -#fSL -o upx.txz https://github.com/upx/upx/releases/download/v4.2.4/upx-4.2.4-amd64_linux.tar.xz
143-
tar -xf upx.txz --strip-components 1
144-
./upx --best ../tmp_dist/php
145-
./upx --best ../tmp_dist/micro.sfx
146-
SFX_SIZE=$(readelf -l ../tmp_dist/micro.sfx | awk '/LOAD|GNU_STACK/ {getline; print $1, $2, $3, $4, $6, $7}' | sed -n '2p' | awk '{print $1}')
147-
head -c $(printf "%d" $SFX_SIZE) ../tmp_dist/micro.sfx > ../tmp_dist/micro.sfx.new
148-
mv ../tmp_dist/micro.sfx.new ../tmp_dist/micro.sfx
149-
./upx --best ../tmp_dist/php-fpm
150-
cd ..
151-
fi
152-
153136
PHPVER=$(cat source/php-src/main/php_version.h | grep "PHP_VERSION " | awk -F\" '{print $2}')
154137
155138
if [ ! -d "dist" ]; then

0 commit comments

Comments
 (0)
Please sign in to comment.