From 2bd419373f8b5d015b97bd8d2d0dcfbc0efe64fd Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Sun, 14 Jul 2024 14:48:58 +0200 Subject: [PATCH 1/3] Update the php-sdk-binary-tools to latest The `PHP-8.3` branch CI still uses the tag `php-sddk-2.2.0` which is almost five years old, so may have missed some important updates. The `master` branch CI uses the `php_downloads_server_migration_v1` branch, which has been superseded a few months ago[1]. To always get the latest updates, we switch to the `master` branch of the php-sdk-binary-tools. [1] --- .github/workflows/nightly.yml | 2 +- .github/workflows/push.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index b3bff2c76171c..244f49a25bc77 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -860,7 +860,7 @@ jobs: PHP_BUILD_CACHE_BASE_DIR: C:\build-cache PHP_BUILD_OBJ_DIR: C:\obj PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk - PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0 + PHP_BUILD_SDK_BRANCH: master PHP_BUILD_CRT: vs16 PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }} THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}" diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 0d10c452b7cb9..918a448b3d577 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -222,7 +222,7 @@ jobs: PHP_BUILD_CACHE_BASE_DIR: C:\build-cache PHP_BUILD_OBJ_DIR: C:\obj PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk - PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0 + PHP_BUILD_SDK_BRANCH: master PHP_BUILD_CRT: vs16 PLATFORM: x64 THREAD_SAFE: "1" From ba0970f138fa3b6dcc1d520b395f0ca1df869d45 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 16 Jul 2024 16:46:29 +0200 Subject: [PATCH 2/3] Use php-sdk-2.3.0 instead of master --- .github/workflows/nightly.yml | 2 +- .github/workflows/push.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 244f49a25bc77..ddb960d87d0e2 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -860,7 +860,7 @@ jobs: PHP_BUILD_CACHE_BASE_DIR: C:\build-cache PHP_BUILD_OBJ_DIR: C:\obj PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk - PHP_BUILD_SDK_BRANCH: master + PHP_BUILD_SDK_BRANCH: 2.3.0 PHP_BUILD_CRT: vs16 PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }} THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}" diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 918a448b3d577..a582edcb32433 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -222,7 +222,7 @@ jobs: PHP_BUILD_CACHE_BASE_DIR: C:\build-cache PHP_BUILD_OBJ_DIR: C:\obj PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk - PHP_BUILD_SDK_BRANCH: master + PHP_BUILD_SDK_BRANCH: 2.3.0 PHP_BUILD_CRT: vs16 PLATFORM: x64 THREAD_SAFE: "1" From f4798c7119dc54c31ffdf20f718bcb40e5100c74 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 16 Jul 2024 17:00:59 +0200 Subject: [PATCH 3/3] Use proper branch name --- .github/workflows/nightly.yml | 2 +- .github/workflows/push.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index ddb960d87d0e2..67c10a54ba205 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -860,7 +860,7 @@ jobs: PHP_BUILD_CACHE_BASE_DIR: C:\build-cache PHP_BUILD_OBJ_DIR: C:\obj PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk - PHP_BUILD_SDK_BRANCH: 2.3.0 + PHP_BUILD_SDK_BRANCH: php-sdk-2.3.0 PHP_BUILD_CRT: vs16 PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }} THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}" diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index a582edcb32433..8eaf8b2bbe582 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -222,7 +222,7 @@ jobs: PHP_BUILD_CACHE_BASE_DIR: C:\build-cache PHP_BUILD_OBJ_DIR: C:\obj PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk - PHP_BUILD_SDK_BRANCH: 2.3.0 + PHP_BUILD_SDK_BRANCH: php-sdk-2.3.0 PHP_BUILD_CRT: vs16 PLATFORM: x64 THREAD_SAFE: "1"