Skip to content

Commit a0e45b0

Browse files
committed
Use HEAD of php-sdk to work around missing wmic
This could should be revised; the whole caching was AppVeyor specific, and doesn't work as expected with GH runners. At least, this is unnecessarily complex.
1 parent 78a18bc commit a0e45b0

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.github/scripts/windows/build.bat

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ if not exist "%PHP_BUILD_CACHE_SDK_DIR%" (
2626
git clone --branch %SDK_BRANCH% %SDK_REMOTE% --depth 1 "%PHP_BUILD_CACHE_SDK_DIR%" 2>&1
2727
)
2828

29-
for /f "tokens=*" %%a in ('type %PHP_BUILD_CACHE_SDK_DIR%\VERSION') do set GOT_SDK_VER=%%a
30-
echo Got SDK version %GOT_SDK_VER%
31-
if NOT "%GOT_SDK_VER%" == "%PHP_BUILD_SDK_BRANCH:~8%" (
32-
echo Switching to the configured SDK version %SDK_BRANCH:~8%
33-
echo Fetching remote SDK repository
34-
git --git-dir="%PHP_BUILD_CACHE_SDK_DIR%\.git" --work-tree="%PHP_BUILD_CACHE_SDK_DIR%" fetch --prune origin 2>&1
35-
echo Checkout SDK repository branch
36-
git --git-dir="%PHP_BUILD_CACHE_SDK_DIR%\.git" --work-tree="%PHP_BUILD_CACHE_SDK_DIR%" checkout --force %SDK_BRANCH%
37-
)
29+
@REM for /f "tokens=*" %%a in ('type %PHP_BUILD_CACHE_SDK_DIR%\VERSION') do set GOT_SDK_VER=%%a
30+
@REM echo Got SDK version %GOT_SDK_VER%
31+
@REM if NOT "%GOT_SDK_VER%" == "%PHP_BUILD_SDK_BRANCH:~8%" (
32+
@REM echo Switching to the configured SDK version %SDK_BRANCH:~8%
33+
@REM echo Fetching remote SDK repository
34+
@REM git --git-dir="%PHP_BUILD_CACHE_SDK_DIR%\.git" --work-tree="%PHP_BUILD_CACHE_SDK_DIR%" fetch --prune origin 2>&1
35+
@REM echo Checkout SDK repository branch
36+
@REM git --git-dir="%PHP_BUILD_CACHE_SDK_DIR%\.git" --work-tree="%PHP_BUILD_CACHE_SDK_DIR%" checkout --force %SDK_BRANCH%
37+
@REM )
3838

3939
if not exist "%SDK_RUNNER%" (
4040
echo "%SDK_RUNNER%" doesn't exist

.github/workflows/push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ jobs:
242242
PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
243243
PHP_BUILD_OBJ_DIR: C:\obj
244244
PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
245-
PHP_BUILD_SDK_BRANCH: php-sdk-2.3.0
245+
PHP_BUILD_SDK_BRANCH: 7f8df69fa5add8beac56916ed69de24e34974f6e
246246
PHP_BUILD_CRT: vs17
247247
PLATFORM: x64
248248
THREAD_SAFE: "1"

0 commit comments

Comments
 (0)