File tree Expand file tree Collapse file tree 5 files changed +20
-12
lines changed Expand file tree Collapse file tree 5 files changed +20
-12
lines changed Original file line number Diff line number Diff line change @@ -33,12 +33,9 @@ if %errorlevel% neq 0 exit /b 3
33
33
del /f /q C:\Windows\System32\libssl-1_1-x64.dll > NUL 2 > NUL
34
34
if %errorlevel% neq 0 exit /b 3
35
35
36
- if /i " %APPVEYOR_REPO_BRANCH:~0 ,4 % " equ " php-" (
37
- set BRANCH = %APPVEYOR_REPO_BRANCH:~4 ,3 %
38
- ) else (
39
- set BRANCH = master
40
- )
36
+ call %~dp0 find-target-branch.bat
41
37
set STABILITY = staging
38
+
42
39
set DEPS_DIR = %PHP_BUILD_CACHE_BASE_DIR% \deps-%BRANCH% -%PHP_SDK_VS% -%PHP_SDK_ARCH%
43
40
rem SDK is cached, deps info is cached as well
44
41
echo Updating dependencies in %DEPS_DIR%
Original file line number Diff line number Diff line change
1
+ @ echo off
2
+
3
+ findstr /m " PHP_VERSION_ID 800" %~dp0 ..\..\..\main\php_version.h
4
+ if %errorlevel% equ 0 (
5
+ set BRANCH = 8.0
6
+ goto :eof
7
+ )
8
+ findstr /m " PHP_VERSION_ID 810" %~dp0 ..\..\..\main\php_version.h
9
+ if %errorlevel% equ 0 (
10
+ set BRANCH = 8.1
11
+ goto :eof
12
+ )
13
+ set BRANCH = master
Original file line number Diff line number Diff line change @@ -9,13 +9,13 @@ set NO_INTERACTION=1
9
9
set REPORT_EXIT_STATUS = 1
10
10
set SKIP_IO_CAPTURE_TESTS = 1
11
11
12
- if /i " %APPVEYOR_REPO_BRANCH:~0 ,4 % " equ " php-" (
13
- set BRANCH = %APPVEYOR_REPO_BRANCH:~4 ,3 %
14
- set STABILITY = stable
15
- ) else (
16
- set BRANCH = master
12
+ call %~dp0 find-target-branch.bat
13
+ if " %BRANCH% " equ " master" (
17
14
set STABILITY = staging
15
+ ) else (
16
+ set STABILITY = stable
18
17
)
18
+
19
19
set DEPS_DIR = %PHP_BUILD_CACHE_BASE_DIR% \deps-%BRANCH% -%PHP_SDK_VS% -%PHP_SDK_ARCH%
20
20
if not exist " %DEPS_DIR% " (
21
21
echo " %DEPS_DIR% " doesn't exist
Original file line number Diff line number Diff line change @@ -596,7 +596,6 @@ jobs:
596
596
name : " ${{ matrix.branch.name }}_WINDOWS_${{ matrix.x64 && 'X64' || 'X86' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
597
597
runs-on : windows-2019
598
598
env :
599
- APPVEYOR_REPO_BRANCH : " ${{ github.ref_name }}"
600
599
PHP_BUILD_CACHE_BASE_DIR : c:\build-cache
601
600
PHP_BUILD_OBJ_DIR : c:\obj
602
601
PHP_BUILD_CACHE_SDK_DIR : c:\build-cache\sdk
Original file line number Diff line number Diff line change @@ -144,7 +144,6 @@ jobs:
144
144
name : " WINDOWS_${{ matrix.x64 && 'X64' || 'X86' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
145
145
runs-on : windows-2019
146
146
env :
147
- APPVEYOR_REPO_BRANCH : " ${{ github.ref_name }}"
148
147
PHP_BUILD_CACHE_BASE_DIR : c:\build-cache
149
148
PHP_BUILD_OBJ_DIR : c:\obj
150
149
PHP_BUILD_CACHE_SDK_DIR : c:\build-cache\sdk
You can’t perform that action at this time.
0 commit comments