From a4b5b025d6fc275e56982305afa832e256084893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Sun, 24 Apr 2022 14:05:54 +0200 Subject: [PATCH 1/7] fix "--with-kerberos" twice --- .github/actions/configure-x64/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/configure-x64/action.yml b/.github/actions/configure-x64/action.yml index 73ce6322d25af..7904766f76028 100644 --- a/.github/actions/configure-x64/action.yml +++ b/.github/actions/configure-x64/action.yml @@ -71,7 +71,6 @@ runs: --with-snmp \ --with-unixODBC \ --with-imap \ - --with-kerberos \ --with-imap-ssl \ --with-pdo-odbc=unixODBC,/usr \ --with-pdo-oci=shared,instantclient,/opt/oracle/instantclient \ From 8db6965cc5a45a0216556c6da8f5efec52e57696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Thu, 22 Sep 2022 11:48:35 +0200 Subject: [PATCH 2/7] unify MacOS push.yml with nightly.yml --- .github/workflows/push.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 520a701a0de43..a018d35076159 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -61,7 +61,14 @@ jobs: -d opcache.jit_buffer_size=16M - name: Verify generated files are up to date uses: ./.github/actions/verify-generated-files - MACOS_DEBUG_NTS: + MACOS: + strategy: + fail-fast: false + matrix: + include: + - debug: true + zts: false + name: "MACOS_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}" runs-on: macos-11 steps: - name: git checkout @@ -71,7 +78,9 @@ jobs: - name: ./configure uses: ./.github/actions/configure-macos with: - configurationParameters: --enable-debug --disable-zts + configurationParameters: >- + --${{ matrix.debug && 'enable' || 'disable' }}-debug + --${{ matrix.zts && 'enable' || 'disable' }}-zts - name: make run: |- export PATH="/usr/local/opt/bison/bin:$PATH" From 31ec1e5a5fba58777f09098d4847d0a0747c466f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Wed, 27 Apr 2022 10:51:09 +0200 Subject: [PATCH 3/7] move AppVeyor scripts to .github/ --- .appveyor.yml | 13 ++++--------- {appveyor => .github/scripts/windows}/build.bat | 2 +- .../scripts/windows}/build_task.bat | 0 {appveyor => .github/scripts/windows}/test.bat | 2 +- {appveyor => .github/scripts/windows}/test_task.bat | 0 buildconf.bat | 1 + ext/standard/tests/file/windows_acls/common.inc | 5 +++++ win32/build/configure.bat | 1 + win32/build/phpize.bat | 1 + 9 files changed, 14 insertions(+), 11 deletions(-) rename {appveyor => .github/scripts/windows}/build.bat (94%) rename {appveyor => .github/scripts/windows}/build_task.bat (100%) rename {appveyor => .github/scripts/windows}/test.bat (71%) rename {appveyor => .github/scripts/windows}/test_task.bat (100%) diff --git a/.appveyor.yml b/.appveyor.yml index 97034c7c437bb..ce74f419d93be 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,12 +2,7 @@ version: "{branch}.build.{build}" image: Visual Studio 2019 -branches: - except: - - PHP-5.6 - - PHP-7.0 - -clone_depth: 64 +clone_depth: 1 skip_commits: files: @@ -51,10 +46,10 @@ services: platform: - x64 - # - x86 + #- x86 build_script: - - appveyor\build.bat + - .github\scripts\windows\build.bat test_script: - - appveyor\test.bat + - .github\scripts\windows\test.bat diff --git a/appveyor/build.bat b/.github/scripts/windows/build.bat similarity index 94% rename from appveyor/build.bat rename to .github/scripts/windows/build.bat index 736667e9f1db4..cee8083349319 100644 --- a/appveyor/build.bat +++ b/.github/scripts/windows/build.bat @@ -38,7 +38,7 @@ if not exist "%SDK_RUNNER%" ( exit /b 3 ) -cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\build_task.bat +cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\.github\scripts\windows\build_task.bat if %errorlevel% neq 0 exit /b 3 exit /b 0 diff --git a/appveyor/build_task.bat b/.github/scripts/windows/build_task.bat similarity index 100% rename from appveyor/build_task.bat rename to .github/scripts/windows/build_task.bat diff --git a/appveyor/test.bat b/.github/scripts/windows/test.bat similarity index 71% rename from appveyor/test.bat rename to .github/scripts/windows/test.bat index 6d4c5fa408f3b..f51a14b9dc64c 100644 --- a/appveyor/test.bat +++ b/.github/scripts/windows/test.bat @@ -6,7 +6,7 @@ if not exist "%SDK_RUNNER%" ( exit /b 3 ) -cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\test_task.bat +cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\.github\scripts\windows\test_task.bat if %errorlevel% neq 0 exit /b 3 exit /b 0 diff --git a/appveyor/test_task.bat b/.github/scripts/windows/test_task.bat similarity index 100% rename from appveyor/test_task.bat rename to .github/scripts/windows/test_task.bat diff --git a/buildconf.bat b/buildconf.bat index 004d36f42c085..fa73a4f590494 100644 --- a/buildconf.bat +++ b/buildconf.bat @@ -1,4 +1,5 @@ @echo off + cscript /nologo /e:jscript win32\build\buildconf.js %* SET PHP_BUILDCONF_PATH=%~dp0 copy %PHP_BUILDCONF_PATH%\win32\build\configure.bat %PHP_BUILDCONF_PATH% > nul diff --git a/ext/standard/tests/file/windows_acls/common.inc b/ext/standard/tests/file/windows_acls/common.inc index b3490ebb432ba..8e69d23b35a66 100644 --- a/ext/standard/tests/file/windows_acls/common.inc +++ b/ext/standard/tests/file/windows_acls/common.inc @@ -16,6 +16,11 @@ function skipif() { if(stripos(php_uname(), 'XP') !== FALSE) { die('skip windows 2003 or newer only test'); } + if (getenv('GITHUB_ACTIONS')) { + // bug44859_4.phpt test fails on the 1st run + // other ACL tests cannot be run twice + die('skip failing on Github Actions (but passes in AppVeyor)'); + } } function get_username(){ diff --git a/win32/build/configure.bat b/win32/build/configure.bat index 8adefd8c96c27..8c9b16007c60e 100644 --- a/win32/build/configure.bat +++ b/win32/build/configure.bat @@ -1,2 +1,3 @@ @echo off + cscript /nologo /e:jscript configure.js %* diff --git a/win32/build/phpize.bat b/win32/build/phpize.bat index 266473325899f..0e90fef72c925 100644 --- a/win32/build/phpize.bat +++ b/win32/build/phpize.bat @@ -1,4 +1,5 @@ @echo off + SET PHP_BUILDCONF_PATH=%~dp0 cscript /nologo /e:jscript %PHP_BUILDCONF_PATH%\script\phpize.js %* IF NOT EXIST configure.bat ( From 3f317662ea5fedfec32cf70c75c9d2acca6f29c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Fri, 30 Sep 2022 18:57:08 +0200 Subject: [PATCH 4/7] revert extra blank line before @echo off --- buildconf.bat | 1 - win32/build/configure.bat | 1 - win32/build/phpize.bat | 1 - 3 files changed, 3 deletions(-) diff --git a/buildconf.bat b/buildconf.bat index fa73a4f590494..004d36f42c085 100644 --- a/buildconf.bat +++ b/buildconf.bat @@ -1,5 +1,4 @@ @echo off - cscript /nologo /e:jscript win32\build\buildconf.js %* SET PHP_BUILDCONF_PATH=%~dp0 copy %PHP_BUILDCONF_PATH%\win32\build\configure.bat %PHP_BUILDCONF_PATH% > nul diff --git a/win32/build/configure.bat b/win32/build/configure.bat index 8c9b16007c60e..8adefd8c96c27 100644 --- a/win32/build/configure.bat +++ b/win32/build/configure.bat @@ -1,3 +1,2 @@ @echo off - cscript /nologo /e:jscript configure.js %* diff --git a/win32/build/phpize.bat b/win32/build/phpize.bat index 0e90fef72c925..266473325899f 100644 --- a/win32/build/phpize.bat +++ b/win32/build/phpize.bat @@ -1,5 +1,4 @@ @echo off - SET PHP_BUILDCONF_PATH=%~dp0 cscript /nologo /e:jscript %PHP_BUILDCONF_PATH%\script\phpize.js %* IF NOT EXIST configure.bat ( From c4182a1a5ba55521ba1169a6fc01e39cd31c6f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Fri, 30 Sep 2022 19:12:18 +0200 Subject: [PATCH 5/7] avx2 on appveyor --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index ce74f419d93be..7567578af258d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -36,7 +36,7 @@ environment: - THREAD_SAFE: 1 OPCACHE: 1 PARALLEL: -j2 - INTRINSICS: AVX + INTRINSICS: AVX2 services: # the setup scripts have to be touched, once some other db version is used From 99aa46461dd01d00833c314cf66702651b5bd349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Thu, 22 Sep 2022 11:48:35 +0200 Subject: [PATCH 6/7] Revert "unify MacOS push.yml with nightly.yml" This reverts commit 8db6965cc5a45a0216556c6da8f5efec52e57696. --- .github/workflows/push.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index a018d35076159..520a701a0de43 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -61,14 +61,7 @@ jobs: -d opcache.jit_buffer_size=16M - name: Verify generated files are up to date uses: ./.github/actions/verify-generated-files - MACOS: - strategy: - fail-fast: false - matrix: - include: - - debug: true - zts: false - name: "MACOS_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}" + MACOS_DEBUG_NTS: runs-on: macos-11 steps: - name: git checkout @@ -78,9 +71,7 @@ jobs: - name: ./configure uses: ./.github/actions/configure-macos with: - configurationParameters: >- - --${{ matrix.debug && 'enable' || 'disable' }}-debug - --${{ matrix.zts && 'enable' || 'disable' }}-zts + configurationParameters: --enable-debug --disable-zts - name: make run: |- export PATH="/usr/local/opt/bison/bin:$PATH" From 56110d37da968f89d15a787813f16a9d7ad9c4b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Fri, 30 Sep 2022 23:07:28 +0200 Subject: [PATCH 7/7] set -ex --- .github/scripts/setup-slapd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/setup-slapd.sh b/.github/scripts/setup-slapd.sh index 7ea3cb33b3d0e..b9cb1a4ff7a95 100755 --- a/.github/scripts/setup-slapd.sh +++ b/.github/scripts/setup-slapd.sh @@ -1,5 +1,5 @@ #!/bin/sh -set -ev +set -ex # Create TLS certificate sudo mkdir -p /etc/ldap/ssl