add retry for CI test download

test intl
2026-07-10 18:35:35 +08:00 · 2024-04-19 23:57:33 +08:00 · 2024-04-19 23:53:58 +08:00 · 2024-04-19 23:32:46 +08:00 · 2024-04-19 15:38:40 +02:00 · 2024-04-19 14:02:09 +02:00
23 changed files with 76 additions and 310 deletions
--- a/.github/workflows/build-linux-arm.yml
+++ b/.github/workflows/build-linux-arm.yml
@@ -45,30 +45,14 @@ jobs:
    name: build ${{ inputs.version }} on ${{ inputs.operating-system }}
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
-
-      # Cache composer dependencies
-      - id: cache-composer-deps
-        uses: actions/cache@v4
-        with:
-          path: vendor
-          key: composer-dependencies
-
-      # If there's no Composer cache, install dependencies
-      - if: steps.cache-composer-deps.outputs.cache-hit != 'true'
-        run: composer update --no-dev --classmap-authoritative
-
-      - name: Generate hashed key for download cache
-        run: |
-          INPUT_HASH=$(echo "${{ runner.os }}-${{ inputs.version }}-${{ inputs.extensions }}" | sha256sum | awk '{print $1}')
-          echo "INPUT_HASH=${INPUT_HASH}" >> $GITHUB_ENV
+      - uses: actions/checkout@v3

      # Cache downloaded source
      - id: cache-download
-        uses: actions/cache@v4
+        uses: actions/cache@v3
        with:
          path: downloads
-          key: php-${{ env.INPUT_HASH }}
+          key: php-${{ inputs.version }}-dependencies-${{ inputs.extensions }}

      # With or without debug
      - if: inputs.debug == true
@@ -91,31 +75,31 @@ jobs:

      # Upload cli executable
      - if: ${{ inputs.build-cli == true }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: php-${{ inputs.version }}-linux-${{ inputs.operating-system }}
          path: buildroot/bin/php

      # Upload micro self-extracted executable
      - if: ${{ inputs.build-micro == true }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: micro-${{ inputs.version }}-linux-${{ inputs.operating-system }}
          path: buildroot/bin/micro.sfx

      # Upload fpm executable
      - if: ${{ inputs.build-fpm == true }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: php-fpm-${{ inputs.version }}-linux-${{ inputs.operating-system }}
          path: buildroot/bin/php-fpm

      # Upload extensions metadata
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
        with:
          name: license-files
          path: buildroot/license/
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
        with:
          name: build-meta
          path: |
--- a/.github/workflows/build-linux-x86_64.yml
+++ b/.github/workflows/build-linux-x86_64.yml
@@ -39,11 +39,11 @@ jobs:
    name: build ${{ inputs.version }} on Linux x86_64
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3

      # Cache composer dependencies
      - id: cache-composer-deps
-        uses: actions/cache@v4
+        uses: actions/cache@v3
        with:
          path: vendor
          key: composer-dependencies
@@ -52,17 +52,12 @@ jobs:
      - if: steps.cache-composer-deps.outputs.cache-hit != 'true'
        run: composer update --no-dev --classmap-authoritative

-      - name: Generate hashed key for download cache
-        run: |
-          INPUT_HASH=$(echo "${{ runner.os }}-${{ inputs.version }}-${{ inputs.extensions }}" | sha256sum | awk '{print $1}')
-          echo "INPUT_HASH=${INPUT_HASH}" >> $GITHUB_ENV
-
      # Cache downloaded source
      - id: cache-download
-        uses: actions/cache@v4
+        uses: actions/cache@v3
        with:
          path: downloads
-          key: php-${{ env.INPUT_HASH }}
+          key: php-${{ inputs.version }}-dependencies-${{ inputs.extensions }}

      # With or without debug
      - if: inputs.debug == true
@@ -85,31 +80,31 @@ jobs:

      # Upload cli executable
      - if: ${{ inputs.build-cli == true }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: php-${{ inputs.version }}-${{ env.SPC_BUILD_OS }}
          path: buildroot/bin/php

      # Upload micro self-extracted executable
      - if: ${{ inputs.build-micro == true }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: micro-${{ inputs.version }}-${{ env.SPC_BUILD_OS }}
          path: buildroot/bin/micro.sfx

      # Upload fpm executable
      - if: ${{ inputs.build-fpm == true }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: php-fpm-${{ inputs.version }}-${{ env.SPC_BUILD_OS }}
          path: buildroot/bin/php-fpm

      # Upload extensions metadata
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
        with:
          name: license-files
          path: buildroot/license/
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
        with:
          name: build-meta
          path: |
--- a/.github/workflows/build-macos-aarch64.yml
+++ b/.github/workflows/build-macos-aarch64.yml
@@ -39,7 +39,7 @@ jobs:
    name: build ${{ inputs.version }} on macOS arm64
    runs-on: macos-14
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3

      # Install macOS missing packages and mark os suffix
      - run: |
@@ -58,7 +58,7 @@ jobs:

      # Cache composer dependencies
      - id: cache-composer-deps
-        uses: actions/cache@v4
+        uses: actions/cache@v3
        with:
          path: vendor
          key: composer-dependencies
@@ -67,17 +67,12 @@ jobs:
      - if: steps.cache-composer-deps.outputs.cache-hit != 'true'
        run: composer update --no-dev --classmap-authoritative

-      - name: Generate hashed key for download cache
-        run: |
-          INPUT_HASH=$(echo "${{ runner.os }}-${{ inputs.version }}-${{ inputs.extensions }}" | sha256sum | awk '{print $1}')
-          echo "INPUT_HASH=${INPUT_HASH}" >> $GITHUB_ENV
-
      # Cache downloaded source
      - id: cache-download
-        uses: actions/cache@v4
+        uses: actions/cache@v3
        with:
          path: downloads
-          key: php-${{ env.INPUT_HASH }}
+          key: php-${{ inputs.version }}-dependencies-${{ inputs.extensions }}

      # With or without debug
      - if: inputs.debug == true
@@ -100,31 +95,31 @@ jobs:

      # Upload cli executable
      - if: ${{ inputs.build-cli == true }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: php-${{ inputs.version }}-${{ env.SPC_BUILD_OS }}
          path: buildroot/bin/php

      # Upload micro self-extracted executable
      - if: ${{ inputs.build-micro == true }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: micro-${{ inputs.version }}-${{ env.SPC_BUILD_OS }}
          path: buildroot/bin/micro.sfx

      # Upload fpm executable
      - if: ${{ inputs.build-fpm == true }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: php-fpm-${{ inputs.version }}-${{ env.SPC_BUILD_OS }}
          path: buildroot/bin/php-fpm

      # Upload extensions metadata
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
        with:
          name: license-files
          path: buildroot/license/
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
        with:
          name: build-meta
          path: |
--- a/.github/workflows/build-macos-x86_64.yml
+++ b/.github/workflows/build-macos-x86_64.yml
@@ -37,26 +37,18 @@ env:
 jobs:
  build:
    name: build ${{ inputs.version }} on macOS x86_64
-    runs-on: macos-13
+    runs-on: macos-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3

      # Install macOS missing packages and mark os suffix
      - run: |
          brew install automake gzip
          echo "SPC_BUILD_OS=macos" >> $GITHUB_ENV

-      - name: "Setup PHP"
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.1
-          tools: pecl, composer
-          extensions: curl, openssl, mbstring, tokenizer
-          ini-values: memory_limit=-1
-
      # Cache composer dependencies
      - id: cache-composer-deps
-        uses: actions/cache@v4
+        uses: actions/cache@v3
        with:
          path: vendor
          key: composer-dependencies
@@ -65,17 +57,12 @@ jobs:
      - if: steps.cache-composer-deps.outputs.cache-hit != 'true'
        run: composer update --no-dev --classmap-authoritative

-      - name: Generate hashed key for download cache
-        run: |
-          INPUT_HASH=$(echo "${{ runner.os }}-${{ inputs.version }}-${{ inputs.extensions }}" | sha256sum | awk '{print $1}')
-          echo "INPUT_HASH=${INPUT_HASH}" >> $GITHUB_ENV
-
      # Cache downloaded source
      - id: cache-download
-        uses: actions/cache@v4
+        uses: actions/cache@v3
        with:
          path: downloads
-          key: php-${{ env.INPUT_HASH }}
+          key: php-${{ inputs.version }}-dependencies-${{ inputs.extensions }}

      # With or without debug
      - if: inputs.debug == true
@@ -98,31 +85,31 @@ jobs:

      # Upload cli executable
      - if: ${{ inputs.build-cli == true }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: php-${{ inputs.version }}-${{ env.SPC_BUILD_OS }}
          path: buildroot/bin/php

      # Upload micro self-extracted executable
      - if: ${{ inputs.build-micro == true }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: micro-${{ inputs.version }}-${{ env.SPC_BUILD_OS }}
          path: buildroot/bin/micro.sfx

      # Upload fpm executable
      - if: ${{ inputs.build-fpm == true }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: php-fpm-${{ inputs.version }}-${{ env.SPC_BUILD_OS }}
          path: buildroot/bin/php-fpm

      # Upload extensions metadata
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
        with:
          name: license-files
          path: buildroot/license/
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
        with:
          name: build-meta
          path: |
--- a/.github/workflows/build-windows-x86_64.yml
+++ b/.github/workflows/build-windows-x86_64.yml
@@ -1,108 +0,0 @@
-name: CI on x86_64 Windows
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        required: true
-        description: php version to compile
-        default: '8.2'
-        type: choice
-        options:
-          - '8.3'
-          - '8.2'
-          - '8.1'
-          - '8.0'
-          - '7.4'
-      build-cli:
-        description: build cli binary
-        default: true
-        type: boolean
-      build-micro:
-        description: build phpmicro binary
-        type: boolean
-      extensions:
-        description: extensions to compile (comma separated)
-        required: true
-        type: string
-      debug:
-        type: boolean
-
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-jobs:
-  build:
-    name: build ${{ inputs.version }} on Windows x86_64
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      # Cache composer dependencies
-      - id: cache-composer-deps
-        uses: actions/cache@v4
-        with:
-          path: vendor
-          key: composer-dependencies
-
-      # If there's no Composer cache, install dependencies
-      - if: steps.cache-composer-deps.outputs.cache-hit != 'true'
-        run: composer update --no-dev --classmap-authoritative
-
-      - name: Generate hashed key for download cache
-        shell: bash
-        run: |
-          INPUT_HASH=$(echo "${{ runner.os }}-${{ inputs.version }}-${{ inputs.extensions }}" | sha256sum | awk '{print $1}')
-          echo "INPUT_HASH=${INPUT_HASH}" >> "$GITHUB_ENV"
-
-      # Cache downloaded source
-      - id: cache-download
-        uses: actions/cache@v4
-        with:
-          path: downloads
-          key: php-${{ env.INPUT_HASH }}
-
-      # With or without debug
-      - if: inputs.debug == true
-        run: echo "SPC_BUILD_DEBUG=--debug" >> $env:GITHUB_ENV
-
-      # With target select: cli, micro or both
-      - if: ${{ inputs.build-cli == true }}
-        run: echo "SPC_BUILD_CLI=--build-cli" >> $env:GITHUB_ENV
-      - if: ${{ inputs.build-micro == true }}
-        run: echo "SPC_BUILD_MICRO=--build-micro" >> $env:GITHUB_ENV
-
-      - run: ./bin/spc doctor
-
-      # If there's no dependencies cache, fetch sources, with or without debug
-      - if: steps.cache-download.outputs.cache-hit != 'true'
-        run: ./bin/spc download --with-php="${{ inputs.version }}" --for-extensions="${{ inputs.extensions }}" ${{ env.SPC_BUILD_DEBUG }}
-
-      # Run build command
-      - run: ./bin/spc build "${{ inputs.extensions }}" ${{ env.SPC_BUILD_DEBUG }} ${{ env.SPC_BUILD_CLI }} ${{ env.SPC_BUILD_MICRO }} ${{ env.SPC_BUILD_FPM }}
-
-      # Upload cli executable
-      - if: ${{ inputs.build-cli == true }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: php-${{ inputs.version }}
-          path: buildroot/bin/php.exe
-
-      # Upload micro self-extracted executable
-      - if: ${{ inputs.build-micro == true }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: micro-${{ inputs.version }}
-          path: buildroot/bin/micro.sfx
-
-      # Upload extensions metadata
-      - uses: actions/upload-artifact@v4
-        with:
-          name: license-files
-          path: buildroot/license/
-      - uses: actions/upload-artifact@v4
-        with:
-          name: build-meta
-          path: |
-            buildroot/build-extensions.json
-            buildroot/build-libraries.json
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -17,7 +17,7 @@ jobs:
        php-version:
          - "8.2"
        micro-version:
-          - "8.2.18"
+          - "8.2.16"
        operating-system:
          - "linux-x86_64"
          - "macos-x86_64"
--- a/README-zh.md
+++ b/README-zh.md
@@ -66,7 +66,7 @@ static-php-cli（简称 `spc`）有许多特性：
 |---------|----------------------|----------------------|
 | macOS   | :octocat: :computer: | :octocat: :computer: |
 | Linux   | :octocat: :computer: | :octocat: :computer: |
-| Windows | :octocat: :computer: |                      |
+| Windows | :computer:           |                      |
 | FreeBSD | :computer:           | :computer:           |

 当前支持编译的 PHP 版本：
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ Here is the supported OS and arch, where :octocat: represents support for GitHub
 |---------|----------------------|----------------------|
 | macOS   | :octocat: :computer: | :octocat: :computer: |
 | Linux   | :octocat: :computer: | :octocat: :computer: |
-| Windows | :octocat: :computer: |                      |
+| Windows | :computer:           |                      |
 | FreeBSD | :computer:           | :computer:           |

 Currently supported PHP versions for compilation: 
--- a/src/SPC/builder/extension/imagick.php
+++ b/src/SPC/builder/extension/imagick.php
@@ -14,11 +14,11 @@ class imagick extends Extension
    public function patchBeforeMake(): bool
    {
        // imagick may call omp_pause_all which requires -lgomp
-        $extra_libs = getenv('SPC_EXTRA_LIBS') ?: '';
+        $extra_libs = $this->builder->getOption('extra-libs', '');
        if ($this->builder instanceof LinuxBuilder) {
-            $extra_libs .= (empty($extra_libs) ? '' : ' ') . '-lgomp ';
+            $extra_libs .= ' -lgomp ';
        }
-        f_putenv('SPC_EXTRA_LIBS=' . $extra_libs);
+        $this->builder->setOption('extra-libs', $extra_libs);
        return true;
    }

--- a/src/SPC/builder/extension/intl.php
+++ b/src/SPC/builder/extension/intl.php
@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\extension;
-
-use SPC\builder\Extension;
-use SPC\store\FileSystem;
-use SPC\util\CustomExt;
-
-#[CustomExt('intl')]
-class intl extends Extension
-{
-    public function patchBeforeBuildconf(): bool
-    {
-        // TODO: remove the following line when https://github.com/php/php-src/pull/14002 will be released
-        FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/intl/config.m4', 'PHP_CXX_COMPILE_STDCXX(11', 'PHP_CXX_COMPILE_STDCXX(17');
-        // Also need to use clang++ -std=c++17 to force override the default C++ standard
-        if (is_string($env = getenv('CXX')) && !str_contains($env, 'std=c++17')) {
-            f_putenv('CXX=' . $env . ' -std=c++17');
-        } else {
-            f_putenv('CXX=clang++ -std=c++17');
-        }
-        return true;
-    }
-}
--- a/src/SPC/builder/linux/LinuxBuilder.php
+++ b/src/SPC/builder/linux/LinuxBuilder.php
@@ -142,22 +142,12 @@ class LinuxBuilder extends UnixBuilderBase
            'CPPFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS'),
            'LDFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS'),
            'LIBS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LIBS'),
+            // TODO: remove the following line when https://github.com/php/php-src/pull/14002 will be released
+            'CXX' => 'g++ -std=c++17',
        ]);

        // upx pack and strip for micro
-        // but always restore Makefile.frag.bak first
-        if (file_exists(SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag.bak')) {
-            copy(SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag.bak', SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag');
-        }
        if ($this->getOption('with-upx-pack', false)) {
-            // judge $(MAKE) micro_2s_objs SFX_FILESIZE=`$(STAT_SIZE) $(SAPI_MICRO_PATH)` count
-            // if 2, replace src/globals/extra/micro-triple-Makefile.frag file content
-            if (substr_count(FileSystem::readFile(SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag'), '$(MAKE) micro_2s_objs SFX_FILESIZE=`$(STAT_SIZE) $(SAPI_MICRO_PATH)`') === 2) {
-                // bak first
-                copy(SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag', SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag.bak');
-                // replace Makefile.frag content
-                FileSystem::writeFile(SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag', FileSystem::readFile(ROOT_DIR . '/src/globals/extra/micro-triple-Makefile.frag'));
-            }
            // with upx pack always need strip
            FileSystem::replaceFileRegex(
                SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag',
--- a/src/SPC/builder/macos/MacOSBuilder.php
+++ b/src/SPC/builder/macos/MacOSBuilder.php
@@ -147,6 +147,8 @@ class MacOSBuilder extends UnixBuilderBase
            'CFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS'),
            'CPPFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS'),
            'LDFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS'),
+            // TODO: remove the following line when https://github.com/php/php-src/pull/14002 will be released
+            'CXX' => 'g++ -std=c++17',
        ]);

        if ($this->getLib('postgresql')) {
--- a/src/SPC/builder/macos/library/xz.php
+++ b/src/SPC/builder/macos/library/xz.php
@@ -1,4 +1,20 @@
 <?php
+/**
+ * Copyright (c) 2022 Yun Dou <dixyes@gmail.com>
+ *
+ * lwmbs is licensed under Mulan PSL v2. You can use this
+ * software according to the terms and conditions of the
+ * Mulan PSL v2. You may obtain a copy of Mulan PSL v2 at:
+ *
+ * http://license.coscl.org.cn/MulanPSL2
+ *
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
+ * WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ *
+ * See the Mulan PSL v2 for more details.
+ */

 declare(strict_types=1);

--- a/src/SPC/builder/unix/library/imagemagick.php
+++ b/src/SPC/builder/unix/library/imagemagick.php
@@ -19,7 +19,7 @@ trait imagemagick
    protected function build(): void
    {
        // TODO: imagemagick build with bzip2 failed with bugs, we need to fix it in the future
-        $extra = '--without-jxl --without-x --enable-openmp --without-bzlib ';
+        $extra = '--without-jxl --without-x --disable-openmp --without-bzlib ';
        $required_libs = '';
        $optional_libs = [
            'libzip' => 'zip',
--- a/src/SPC/builder/unix/library/ncurses.php
+++ b/src/SPC/builder/unix/library/ncurses.php
@@ -17,7 +17,7 @@ trait ncurses
                '--with-curses-h ' .
                '--enable-pc-files ' .
                '--enable-echo ' .
-                '--disable-widec ' .
+                // '--enable-widec ' .
                '--with-normal ' .
                '--with-ticlib ' .
                '--without-tests ' .
--- a/src/SPC/builder/unix/library/pkgconfig.php
+++ b/src/SPC/builder/unix/library/pkgconfig.php
@@ -8,8 +8,8 @@ trait pkgconfig
 {
    protected function build(): void
    {
-        $cflags = PHP_OS_FAMILY !== 'Linux' ? "{$this->builder->arch_c_flags} -Wimplicit-function-declaration -Wno-int-conversion" : '';
-        $ldflags = PHP_OS_FAMILY !== 'Linux' ? '' : '--static';
+        $cflags = PHP_OS_FAMILY === 'Darwin' ? "{$this->builder->arch_c_flags} -Wimplicit-function-declaration -Wno-int-conversion" : '';
+        $ldflags = PHP_OS_FAMILY === 'Darwin' ? '' : '--static';

        shell()->cd($this->source_dir)
            ->setEnv(['CFLAGS' => $this->getLibExtraCFlags() ?: $cflags, 'LDFLAGS' => $this->getLibExtraLdFlags() ?: $ldflags, 'LIBS' => $this->getLibExtraLibs()])
--- a/src/SPC/builder/unix/library/xz.php
+++ b/src/SPC/builder/unix/library/xz.php
@@ -20,6 +20,7 @@ trait xz
                './configure ' .
                '--enable-static ' .
                '--disable-shared ' .
+                "--host={$this->builder->getOption('gnu-arch')}-unknown-linux " .
                '--disable-scripts ' .
                '--disable-doc ' .
                '--with-libiconv ' .
--- a/src/SPC/builder/windows/library/nghttp2.php
+++ b/src/SPC/builder/windows/library/nghttp2.php
@@ -25,8 +25,6 @@ class nghttp2 extends WindowsLibraryBase
                '-DCMAKE_BUILD_TYPE=Release ' .
                '-DENABLE_SHARED_LIB=OFF ' .
                '-DENABLE_STATIC_LIB=ON ' .
-                '-DBUILD_STATIC_LIBS=ON ' .
-                '-DBUILD_SHARED_LIBS=OFF ' .
                '-DENABLE_STATIC_CRT=ON ' .
                '-DENABLE_LIB_ONLY=ON ' .
                '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' '
--- a/src/SPC/command/BuildCliCommand.php
+++ b/src/SPC/command/BuildCliCommand.php
@@ -131,8 +131,8 @@ class BuildCliCommand extends BuildCommand
            if (!empty($not_included)) {
                $indent_texts['Extra Exts (' . count($not_included) . ')'] = implode(', ', $not_included);
            }
-            $this->printFormatInfo($this->getDefinedEnvs(), true);
            $this->printFormatInfo($indent_texts);
+            $this->printFormatInfo($this->getDefinedEnvs(), true);
            logger()->notice('Build will start after 2s ...');
            sleep(2);

--- a/src/SPC/util/DependencyUtil.php
+++ b/src/SPC/util/DependencyUtil.php
@@ -62,17 +62,12 @@ class DependencyUtil

        if ($include_suggested_libs) {
            foreach ($dep_list as $name => $obj) {
-                $del_list = [];
                foreach ($obj['suggests'] as $id => $suggest) {
                    if (!str_starts_with($suggest, 'ext@')) {
                        $dep_list[$name]['depends'][] = $suggest;
-                        $del_list[] = $id;
+                        array_splice($dep_list[$name]['suggests'], $id, 1);
                    }
                }
-                foreach ($del_list as $id) {
-                    unset($dep_list[$name]['suggests'][$id]);
-                }
-                $dep_list[$name]['suggests'] = array_values($dep_list[$name]['suggests']);
            }
        }

@@ -98,17 +93,12 @@ class DependencyUtil
        if ($include_suggested_exts) {
            // check every deps suggests contains ext@
            foreach ($dep_list as $name => $obj) {
-                $del_list = [];
                foreach ($obj['suggests'] as $id => $suggest) {
                    if (str_starts_with($suggest, 'ext@')) {
                        $dep_list[$name]['depends'][] = $suggest;
-                        $del_list[] = $id;
+                        array_splice($dep_list[$name]['suggests'], $id, 1);
                    }
                }
-                foreach ($del_list as $id) {
-                    unset($dep_list[$name]['suggests'][$id]);
-                }
-                $dep_list[$name]['suggests'] = array_values($dep_list[$name]['suggests']);
            }
        }

@@ -116,17 +106,12 @@ class DependencyUtil
        if ($include_suggested_libs) {
            // check every deps suggests
            foreach ($dep_list as $name => $obj) {
-                $del_list = [];
                foreach ($obj['suggests'] as $id => $suggest) {
                    if (!str_starts_with($suggest, 'ext@')) {
                        $dep_list[$name]['depends'][] = $suggest;
-                        $del_list[] = $id;
+                        array_splice($dep_list[$name]['suggests'], $id, 1);
                    }
                }
-                foreach ($del_list as $id) {
-                    unset($dep_list[$name]['suggests'][$id]);
-                }
-                $dep_list[$name]['suggests'] = array_values($dep_list[$name]['suggests']);
            }
        }

--- a/src/SPC/util/GlobalEnvManager.php
+++ b/src/SPC/util/GlobalEnvManager.php
@@ -63,7 +63,6 @@ class GlobalEnvManager
    {
        // Windows need php-sdk binary tools
        self::initIfNotExists('PHP_SDK_PATH', WORKING_DIR . DIRECTORY_SEPARATOR . 'php-sdk-binary-tools');
-        self::initIfNotExists('UPX_EXEC', PKG_ROOT_PATH . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'upx.exe');
    }

    private static function initLinuxEnv(BuilderBase $builder): void
@@ -80,9 +79,7 @@ class GlobalEnvManager
            self::initIfNotExists('CXX', "{$arch}-linux-musl-g++");
            self::initIfNotExists('AR', "{$arch}-linux-musl-ar");
            self::initIfNotExists('LD', 'ld.gold');
-            if (getenv('SPC_NO_MUSL_PATH') !== 'yes') {
-                self::putenv("PATH=/usr/local/musl/bin:/usr/local/musl/{$arch}-linux-musl/bin:" . getenv('PATH'));
-            }
+            self::putenv("PATH=/usr/local/musl/bin:/usr/local/musl/{$arch}-linux-musl/bin:" . getenv('PATH'));
        }

        // Init arch-specific cflags
@@ -108,11 +105,12 @@ class GlobalEnvManager
            'SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS' => getenv('SPC_DEFAULT_C_FLAGS'),
            'SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH,
            'SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS' => '-L' . BUILD_LIB_PATH,
-            'SPC_CMD_VAR_PHP_CONFIGURE_LIBS' => '-ldl -lpthread -lm',
+            'SPC_CMD_VAR_PHP_CONFIGURE_LIBS' => '-ldl -lpthread',
            'SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS' => $php_extra_cflags_optimize . ' -fno-ident -fPIE',
            'SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS' => '',
            'SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM' => $clang_use_lld . '-all-static',
        ];
+
        foreach ($init_spc_cmd_maps as $name => $value) {
            self::initIfNotExists($name, $value);
        }
--- a/src/globals/extra/micro-triple-Makefile.frag
+++ b/src/globals/extra/micro-triple-Makefile.frag
@@ -1,51 +0,0 @@
-
-micro: $(SAPI_MICRO_PATH)
-
-micro_2s_objs:
-	rm $(MICRO_2STAGE_OBJS) || :
-	$(MAKE) $(MICRO_2STAGE_OBJS)
-
-EXTRA_MICRO_BUILD_COMMANDS=
-POST_MICRO_BUILD_COMMANDS=$(STRIP) $(MICRO_STRIP_FLAGS) $(SAPI_MICRO_PATH)
-
-$(SAPI_MICRO_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_MICRO_OBJS)
-	$(MAKE) micro_2s_objs SFX_FILESIZE=0xcafebabe
-	$(BUILD_MICRO)
-	$(EXTRA_MICRO_BUILD_COMMANDS)
-	$(POST_MICRO_BUILD_COMMANDS)
-	$(MAKE) micro_2s_objs SFX_FILESIZE=`$(STAT_SIZE) $(SAPI_MICRO_PATH)`
-	$(BUILD_MICRO)
-	$(EXTRA_MICRO_BUILD_COMMANDS)
-	$(POST_MICRO_BUILD_COMMANDS)
-	$(MAKE) micro_2s_objs SFX_FILESIZE=`$(STAT_SIZE) $(SAPI_MICRO_PATH)`
-	$(BUILD_MICRO)
-	$(EXTRA_MICRO_BUILD_COMMANDS)
-	$(POST_MICRO_BUILD_COMMANDS)
-	$(MAKE) micro_2s_objs SFX_FILESIZE=`$(STAT_SIZE) $(SAPI_MICRO_PATH)`
-	$(BUILD_MICRO)
-	$(EXTRA_MICRO_BUILD_COMMANDS)
-	$(POST_MICRO_BUILD_COMMANDS)
-
-MICRO_EXES = sapi/micro/tests/simpleecho.exe sapi/micro/tests/fakecmd.exe
-
-$(MICRO_EXES): $(SAPI_MICRO_PATH)
-	@binname=$@;\
-	cat $(SAPI_MICRO_PATH) $${binname%.exe}.php > $@ || {\
-		rm $@; \
-		exit 1; \
-	}
-	@chmod 0755 $@
-
-MICRO_FAKECMD=sapi/micro/tests/fakecmd.exe
-
-micro_test: $(SAPI_MICRO_PATH) $(MICRO_EXES)
-	@[ x"hello world" = "x`sapi/micro/tests/simpleecho.exe nonce world`" ] || {\
-		echo sanity check for micro.sfx failed, the sfx generated may be corrupt. >&2 ;\
-		exit 1;\
-	}
-	@SKIP_IO_CAPTURE_TESTS=yes \
-	TEST_PHP_EXECUTABLE=$(MICRO_FAKECMD) \
-	TEST_PHP_SRCDIR=$(top_srcdir) \
-	CC="$(CC)" \
-		$(MICRO_FAKECMD) -n $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n $(TESTS); \
-	exit $$?;
--- a/src/globals/test-extensions.php
+++ b/src/globals/test-extensions.php
@@ -13,7 +13,7 @@ declare(strict_types=1);

 // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
 $extensions = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'readline,pgsql,xml,dom,mbstring,mbregex,pdo_pgsql',
+    'Linux', 'Darwin' => 'intl,posix',
    'Windows' => 'mbstring,pdo_sqlite,mbregex',
 };

@@ -27,7 +27,7 @@ $with_libs = match (PHP_OS_FAMILY) {
 // You can use `common`, `bulk`, `minimal` or `none`.
 // note: combination is only available for *nix platform. Windows must use `none` combination
 $base_combination = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'none',
+    'Linux', 'Darwin' => 'minimal',
    'Windows' => 'none',
 };
Author	SHA1	Message	Date
crazywhalecc	57b3db4814	add retry for CI test download	2024-04-19 23:57:33 +08:00
crazywhalecc	2b246fab7c	test intl	2024-04-19 23:53:58 +08:00
crazywhalecc	345353b57a	test intl	2024-04-19 23:32:46 +08:00
Kévin Dunglas	6478950057	hack CXX env var to force C++17	2024-04-19 15:38:40 +02:00
Kévin Dunglas	958ebcd9f8	wip	2024-04-19 14:02:09 +02:00
Kévin Dunglas	354e2d0664	fix: use C++ 17 compiler for ICU	2024-04-19 10:02:16 +02:00