diff --git a/.github/workflows/ext-configure-tests.yml b/.github/workflows/ext-configure-tests.yml deleted file mode 100644 index d1f629ec..00000000 --- a/.github/workflows/ext-configure-tests.yml +++ /dev/null @@ -1,77 +0,0 @@ -name: "Extension configure tests" - -on: - workflow_dispatch: - pull_request: - branches: [ "main" ] - paths: - - '.github/workflows/ext-configure-tests.yml' - -jobs: - test: - name: "${{ matrix.extension }} (PHP ${{ matrix.php-version }} on ${{ matrix.operating-system }})" - runs-on: ${{ matrix.operating-system }} - strategy: - fail-fast: false - matrix: - extension: - - parallel - - pdo_pgsql - - pgsql - php-version: - - "8.4" - - "8.3" - - "8.2" - - "8.1" - operating-system: - - "ubuntu-latest" - - "macos-14" - - steps: - - name: "Checkout" - uses: "actions/checkout@v4" - - - name: OS type - id: os-type - run: | - OS="" - if [ "${{ matrix.operating-system }}" = "ubuntu-latest" ]; then - OS="linux-x86_64" - elif [ "${{ matrix.operating-system }}" = "macos-13" ]; then - OS="macos-x86_64" - elif [ "${{ matrix.operating-system }}" = "debian-arm64-self-hosted" ]; then - OS="linux-aarch64" - elif [ "${{ matrix.operating-system }}" = "macos-14" ]; then - OS="macos-aarch64" - fi - echo "OS=$OS" >> $GITHUB_ENV - - - name: "Setup PHP" - uses: shivammathur/setup-php@v2 - with: - php-version: 8.2 - tools: pecl, composer - extensions: curl, openssl, mbstring - ini-values: memory_limit=-1 - env: - phpts: nts - - - name: "Install Dependencies" - run: composer update -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist - - - id: cache-download - uses: actions/cache@v4 - with: - path: downloads - key: php-${{ matrix.php-version }}-dependencies-for-tests - - # If there's no dependencies cache, fetch sources - - name: "Download sources" - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: ./bin/spc download --with-php=${{ matrix.php-version }} --for-extensions=${{ matrix.extension }} --debug --ignore-cache-sources=php-src - - - name: "Build library: ${{ matrix.library }}" - run: | - SPC_USE_SUDO=yes ./bin/spc doctor --auto-fix - ./bin/spc build --build-cli --build-micro ${{ matrix.extension }} -P tests/configure.php --debug --enable-zts diff --git a/src/SPC/builder/extension/parallel.php b/src/SPC/builder/extension/parallel.php index f50dffb2..de4e5d88 100644 --- a/src/SPC/builder/extension/parallel.php +++ b/src/SPC/builder/extension/parallel.php @@ -6,6 +6,7 @@ use SPC\builder\Extension; use SPC\exception\WrongUsageException; +use SPC\store\FileSystem; use SPC\util\CustomExt; #[CustomExt('parallel')] @@ -17,4 +18,10 @@ public function validate(): void throw new WrongUsageException('ext-parallel must be built with ZTS builds. Use "--enable-zts" option!'); } } + + public function patchBeforeBuildconf(): bool + { + FileSystem::replaceFileRegex(SOURCE_PATH . '/php-src/ext/parallel/config.m4', '/PHP_VERSION=.*/m', ''); + return true; + } } diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php index 6bf02159..a08ebc7f 100644 --- a/src/globals/test-extensions.php +++ b/src/globals/test-extensions.php @@ -26,7 +26,7 @@ ]; // whether enable thread safe -$zts = false; +$zts = true; $no_strip = false; @@ -38,7 +38,7 @@ // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`). $extensions = match (PHP_OS_FAMILY) { - 'Linux', 'Darwin' => 'grpc,openssl,pgsql', + 'Linux', 'Darwin' => 'parallel', 'Windows' => 'amqp,apcu,bcmath,bz2,calendar,ctype,curl,dba,dom,ds,exif,ffi,fileinfo,filter,ftp,gd,iconv,igbinary,libxml,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pdo,pdo_mysql,pdo_sqlite,pdo_sqlsrv,phar,rar,redis,session,shmop,simdjson,simplexml,soap,sockets,sqlite3,sqlsrv,ssh2,swow,sysvshm,tokenizer,xml,xmlreader,xmlwriter,yac,yaml,zip,zlib', }; diff --git a/tests/configure.php b/tests/configure.php deleted file mode 100644 index 6811b631..00000000 --- a/tests/configure.php +++ /dev/null @@ -1,13 +0,0 @@ -