From 4308aad7c9155d9886453e3c9dc1508becc47214 Mon Sep 17 00:00:00 2001 From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Date: Sat, 9 Nov 2024 11:13:14 +0100 Subject: [PATCH 1/2] Try to fix macOS CI --- .github/actions/brew/action.yml | 3 ++- .github/workflows/push.yml | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/actions/brew/action.yml b/.github/actions/brew/action.yml index 287062e6f9f9c..c400e20b53d17 100644 --- a/.github/actions/brew/action.yml +++ b/.github/actions/brew/action.yml @@ -26,4 +26,5 @@ runs: t1lib \ libxml2 \ libjpeg \ - libxslt + libxslt \ + openldap diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 6baf80d5f84b0..c3548bb5f271c 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -41,7 +41,7 @@ env: CXX: ccache g++ jobs: LINUX_X64: - if: github.repository == 'php/php-src' || github.event_name == 'pull_request' + if: false services: mysql: image: mysql:8.3 @@ -137,7 +137,7 @@ jobs: if: ${{ !matrix.asan }} uses: ./.github/actions/verify-generated-files LINUX_X32: - if: github.repository == 'php/php-src' || github.event_name == 'pull_request' + if: false name: LINUX_X32_DEBUG_ZTS runs-on: ubuntu-latest timeout-minutes: 50 @@ -226,7 +226,7 @@ jobs: - name: Verify generated files are up to date uses: ./.github/actions/verify-generated-files WINDOWS: - if: github.repository == 'php/php-src' || github.event_name == 'pull_request' + if: false name: WINDOWS_X64_ZTS runs-on: windows-2022 timeout-minutes: 50 @@ -254,7 +254,7 @@ jobs: run: .github/scripts/windows/test.bat BENCHMARKING: name: BENCHMARKING - if: github.repository == 'php/php-src' || github.event_name == 'pull_request' + if: false runs-on: ubuntu-24.04 timeout-minutes: 50 steps: From 9480c4c8191916f190404d55fcf92a5082718a3c Mon Sep 17 00:00:00 2001 From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Date: Sat, 9 Nov 2024 14:29:04 +0100 Subject: [PATCH 2/2] test --- .github/actions/brew/action.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/actions/brew/action.yml b/.github/actions/brew/action.yml index c400e20b53d17..07595a5ada931 100644 --- a/.github/actions/brew/action.yml +++ b/.github/actions/brew/action.yml @@ -13,7 +13,7 @@ runs: # Some packages exist on x86 but not arm, or vice versa. # Install them with reinstall to avoid warnings. - brew reinstall autoconf webp tidy-html5 libzip libsodium icu4c + brew reinstall autoconf webp tidy-html5 libzip libsodium icu4c curl brew install \ bison \ re2c @@ -26,5 +26,4 @@ runs: t1lib \ libxml2 \ libjpeg \ - libxslt \ - openldap + libxslt