From 61583047e0b48ba4ebf8fa8c74e84f2cb88258e1 Mon Sep 17 00:00:00 2001 From: Eser DENIZ Date: Tue, 17 Dec 2024 14:07:40 +0100 Subject: [PATCH 1/7] fix: 7za | tar not working on bash shell --- .github/workflows/build-php.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-php.yml b/.github/workflows/build-php.yml index 5d54e70e1..fcb7be054 100644 --- a/.github/workflows/build-php.yml +++ b/.github/workflows/build-php.yml @@ -119,7 +119,6 @@ jobs: cd ../php-bin - name: Build PHP - shell: bash run: | cd ../static-php-cli ./bin/spc build --build-cli "${{ env.PHP_EXTENSIONS }}" From 483f919664879da8a83fe7413d0fd07f088da88d Mon Sep 17 00:00:00 2001 From: Eser DENIZ Date: Tue, 17 Dec 2024 14:10:41 +0100 Subject: [PATCH 2/7] fix: php-bin directory does not exist at first build --- .github/workflows/build-php.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-php.yml b/.github/workflows/build-php.yml index fcb7be054..3d0ab0441 100644 --- a/.github/workflows/build-php.yml +++ b/.github/workflows/build-php.yml @@ -35,7 +35,9 @@ jobs: git clone https://github.com/crazywhalecc/static-php-cli.git cd static-php-cli git checkout main - cd ../php-bin + cd ../ + [ ! -d php-bin ] && mkdir -p php-bin + cd php-bin - shell: bash run: | From 9445fb7bb54157597c353be055018aac4111ec54 Mon Sep 17 00:00:00 2001 From: Eser DENIZ Date: Tue, 17 Dec 2024 15:07:59 +0100 Subject: [PATCH 3/7] fix: update extension list with essential dependencies --- php-extensions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-extensions.txt b/php-extensions.txt index 92377999b..b650dad8a 100644 --- a/php-extensions.txt +++ b/php-extensions.txt @@ -1 +1 @@ -bcmath,ctype,curl,dom,fileinfo,filter,gd,mbstring,opcache,openssl,pdo,pdo_sqlite,phar,session,simplexml,sockets,sqlite3,tokenizer,xml,zip,zlib +bcmath,bz2,ctype,curl,dom,fileinfo,filter,gd,iconv,mbstring,opcache,openssl,pdo,pdo_sqlite,phar,session,simplexml,sockets,sqlite3,tokenizer,xml,zip,zlib \ No newline at end of file From 13253b7be0db57dfddbc567fc15bc332ebfc0a3a Mon Sep 17 00:00:00 2001 From: Eser DENIZ Date: Wed, 25 Dec 2024 00:06:53 +0100 Subject: [PATCH 4/7] fix: temp fix to windows build --- .github/workflows/build-php.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/build-php.yml b/.github/workflows/build-php.yml index 3d0ab0441..e5e95d57f 100644 --- a/.github/workflows/build-php.yml +++ b/.github/workflows/build-php.yml @@ -39,6 +39,28 @@ jobs: [ ! -d php-bin ] && mkdir -p php-bin cd php-bin + # Copy downloads/micro/patches/cli_static.patch + # to downloads/micro/patches/cli_static_80.patch + # to downloads/micro/patches/cli_static_81.patch + # to downloads/micro/patches/cli_static_82.patch + # to downloads/micro/patches/cli_static_83.patch + # to downloads/micro/patches/cli_static_84.patch + # + # Remove downloads/micro/patches/cli_static.patch + # Remove line 18 of downloads/micro/patches/cli_static_84.patch + - name: Fix micro patches + shell: bash + run: | + cd ../static-php-cli + cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_80.patch + cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_81.patch + cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_82.patch + cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_83.patch + cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_84.patch + sed -i '' '18d' downloads/micro/patches/cli_static_84.patch + rm -f downloads/micro/patches/cli_static.patch + cd ../php-bin + - shell: bash run: | PHP_VERSION=$(echo "${{ matrix.version }}" | cut -d. -f1,2) From ac688526e688d8d67739229b87bdeb6cf731dbbb Mon Sep 17 00:00:00 2001 From: Eser DENIZ Date: Wed, 25 Dec 2024 00:08:42 +0100 Subject: [PATCH 5/7] Revert "fix: temp fix to windows build" This reverts commit 13253b7be0db57dfddbc567fc15bc332ebfc0a3a. --- .github/workflows/build-php.yml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/.github/workflows/build-php.yml b/.github/workflows/build-php.yml index e5e95d57f..3d0ab0441 100644 --- a/.github/workflows/build-php.yml +++ b/.github/workflows/build-php.yml @@ -39,28 +39,6 @@ jobs: [ ! -d php-bin ] && mkdir -p php-bin cd php-bin - # Copy downloads/micro/patches/cli_static.patch - # to downloads/micro/patches/cli_static_80.patch - # to downloads/micro/patches/cli_static_81.patch - # to downloads/micro/patches/cli_static_82.patch - # to downloads/micro/patches/cli_static_83.patch - # to downloads/micro/patches/cli_static_84.patch - # - # Remove downloads/micro/patches/cli_static.patch - # Remove line 18 of downloads/micro/patches/cli_static_84.patch - - name: Fix micro patches - shell: bash - run: | - cd ../static-php-cli - cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_80.patch - cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_81.patch - cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_82.patch - cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_83.patch - cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_84.patch - sed -i '' '18d' downloads/micro/patches/cli_static_84.patch - rm -f downloads/micro/patches/cli_static.patch - cd ../php-bin - - shell: bash run: | PHP_VERSION=$(echo "${{ matrix.version }}" | cut -d. -f1,2) From 12249ad59642f54c03761974c4f09d6f8d347b9e Mon Sep 17 00:00:00 2001 From: Eser DENIZ Date: Wed, 25 Dec 2024 01:34:53 +0100 Subject: [PATCH 6/7] fix: patched a patch. Is it stupid if it works? --- .github/workflows/build-php.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/build-php.yml b/.github/workflows/build-php.yml index 3d0ab0441..c733fa788 100644 --- a/.github/workflows/build-php.yml +++ b/.github/workflows/build-php.yml @@ -120,6 +120,24 @@ jobs: ./bin/spc download --with-php=${{ matrix.version }} --for-extensions "${{ env.PHP_EXTENSIONS }}" --prefer-pre-built cd ../php-bin + + - name: Patch for windows 8.4 builds + shell: bash + run: | + cd ../static-php-cli + cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_80.patch + cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_81.patch + cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_82.patch + cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_83.patch + cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_84.patch +# Remove line 18 of downloads/micro/patches/cli_static_84.patch + sed -i '18d' downloads/micro/patches/cli_static_84.patch +# Change line 14 of downloads/micro/patches/cli_static_84.patch + sed -i 's/+1160,11/+1160,10/' downloads/micro/patches/cli_static_84.patch + rm -f downloads/micro/patches/cli_static.patch + cat downloads/micro/patches/cli_static_84.patch + cd ../php-bin + - name: Build PHP run: | cd ../static-php-cli From 908aab2a6ed03e29ef00b033b2e4e3ec1750b71c Mon Sep 17 00:00:00 2001 From: Eser DENIZ Date: Wed, 25 Dec 2024 01:37:03 +0100 Subject: [PATCH 7/7] fix: patched a patch. Is it stupid if it works? --- .github/workflows/build-php.yml | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-php.yml b/.github/workflows/build-php.yml index c733fa788..b65e01ba9 100644 --- a/.github/workflows/build-php.yml +++ b/.github/workflows/build-php.yml @@ -120,23 +120,20 @@ jobs: ./bin/spc download --with-php=${{ matrix.version }} --for-extensions "${{ env.PHP_EXTENSIONS }}" --prefer-pre-built cd ../php-bin - - name: Patch for windows 8.4 builds shell: bash run: | - cd ../static-php-cli - cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_80.patch - cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_81.patch - cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_82.patch - cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_83.patch - cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_84.patch -# Remove line 18 of downloads/micro/patches/cli_static_84.patch - sed -i '18d' downloads/micro/patches/cli_static_84.patch -# Change line 14 of downloads/micro/patches/cli_static_84.patch - sed -i 's/+1160,11/+1160,10/' downloads/micro/patches/cli_static_84.patch - rm -f downloads/micro/patches/cli_static.patch - cat downloads/micro/patches/cli_static_84.patch - cd ../php-bin + cd ../static-php-cli + cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_80.patch + cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_81.patch + cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_82.patch + cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_83.patch + cp downloads/micro/patches/cli_static.patch downloads/micro/patches/cli_static_84.patch + sed -i '18d' downloads/micro/patches/cli_static_84.patch + sed -i 's/+1160,11/+1160,10/' downloads/micro/patches/cli_static_84.patch + rm -f downloads/micro/patches/cli_static.patch + cat downloads/micro/patches/cli_static_84.patch + cd ../php-bin - name: Build PHP run: |