Skip to content

Commit 1abf1dc

Browse files
committed
chore(ci): update windows script
1 parent 6192de8 commit 1abf1dc

3 files changed

Lines changed: 17 additions & 17 deletions

File tree

.github/workflows/build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Add-Content $task 'call phpize 2>&1'
77
Add-Content $task "call configure --with-php-build=C:\php\deps --enable-$env:PHP_EXT --enable-debug-pack 2>&1"
88
Add-Content $task 'nmake /nologo 2>&1'
99
Add-Content $task 'exit %errorlevel%'
10-
& "C:\php\php-sdk-$env:BIN_SDK_VER\phpsdk-$env:VC-$env:ARCH.bat" -t $task
10+
& "C:\php\php-sdk-$env:BIN_SDK_VER\phpsdk-$env:VS-$env:ARCH.bat" -t $task
1111
if (-not $?) {
1212
throw "building failed with errorlevel $LastExitCode"
1313
}

.github/workflows/install.ps1

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ if (-not (Test-Path 'C:\php')) {
77
# PHP SDK
88
$bname = "php-sdk-$env:BIN_SDK_VER.zip"
99
if (-not (Test-Path C:\php\$bname)) {
10-
echo "Download: https://github.com/microsoft/php-sdk-binary-tools/archive/$bname"
11-
Invoke-WebRequest "https://github.com/microsoft/php-sdk-binary-tools/archive/$bname" -OutFile "C:\php\$bname"
10+
echo "Download: https://github.com/php/php-sdk-binary-tools/archive/$bname"
11+
Invoke-WebRequest "https://github.com/php/php-sdk-binary-tools/archive/$bname" -OutFile "C:\php\$bname"
1212
}
1313
$dname0 = "php-sdk-binary-tools-php-sdk-$env:BIN_SDK_VER"
1414
$dname1 = "php-sdk-$env:BIN_SDK_VER"
@@ -32,7 +32,7 @@ $ts_part = ''
3232
if ('nts' -eq $env:TS) {
3333
$ts_part = '-nts'
3434
}
35-
$bname = "php-devel-pack-$php_version$ts_part-Win32-$env:VC-$env:ARCH.zip"
35+
$bname = "php-devel-pack-$php_version$ts_part-Win32-$env:VS-$env:ARCH.zip"
3636
if (-not (Test-Path "C:\php\$bname")) {
3737
try {
3838
echo "Download: https://windows.php.net/downloads/releases/$bname"
@@ -42,20 +42,20 @@ if (-not (Test-Path "C:\php\$bname")) {
4242
Invoke-WebRequest "https://windows.php.net/downloads/releases/archives/$bname" -OutFile "C:\php\$bname"
4343
}
4444
}
45-
$dname = "php-$php_version-devel-$env:VC-$env:ARCH"
45+
$dname = "php-$php_version-devel-$env:VS-$env:ARCH"
4646
if (-not (Test-Path "C:\php\devel")) {
4747
Expand-Archive "C:\php\$bname" 'C:\php'
4848
if (-not (Test-Path "C:\php\$dname")) {
4949
$php_normalize_version = $php_version.Split("-")[0]
50-
$dname = "php-$php_normalize_version-devel-$env:VC-$env:ARCH"
50+
$dname = "php-$php_normalize_version-devel-$env:VS-$env:ARCH"
5151
}
5252
if (-not (Test-Path "C:\php\devel")) {
5353
Move-Item "C:\php\$dname" "C:\php\devel"
5454
}
5555
}
5656

5757
# PHP binary: "C:\php\bin"
58-
$bname = "php-$php_version$ts_part-Win32-$env:VC-$env:ARCH.zip"
58+
$bname = "php-$php_version$ts_part-Win32-$env:VS-$env:ARCH.zip"
5959
if (-not (Test-Path "C:\php\$bname")) {
6060
try {
6161
echo "Download: https://windows.php.net/downloads/releases/$bname"
@@ -70,7 +70,7 @@ if (-not (Test-Path "C:\php\bin")) {
7070
}
7171

7272
# # library dependency: "C:\php\deps"
73-
# $bname = "$env:DEP-$env:VC-$env:ARCH.zip"
73+
# $bname = "$env:DEP-$env:VS-$env:ARCH.zip"
7474
# if (-not (Test-Path "C:\php\$bname")) {
7575
# echo "Download: https://windows.php.net/downloads/pecl/deps/$bname"
7676
# Invoke-WebRequest "https://windows.php.net/downloads/pecl/deps/$bname" -OutFile "C:\php\$bname"

.github/workflows/windows.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push]
44

55
env:
66
PHP_EXT: snappy
7-
BIN_SDK_VER: 2.2.0
7+
BIN_SDK_VER: 2.3.0
88

99
jobs:
1010
ci:
@@ -21,27 +21,27 @@ jobs:
2121
ts:
2222
- 'nts'
2323
- 'ts'
24-
vc:
24+
vs:
2525
- vs16
2626
- vs17
2727
library:
2828
- ''
2929
- 'vcpkg'
3030
exclude:
3131
- php: '8.4'
32-
vc: vs16
32+
vs: vs16
3333
- php: '8.3'
34-
vc: vs17
34+
vs: vs17
3535
- php: '8.2'
36-
vc: vs17
36+
vs: vs17
3737
- php: '8.1'
38-
vc: vs17
38+
vs: vs17
3939

40-
runs-on: ${{ matrix.vc == 'vs17' && 'windows-2022' || 'windows-2019' }}
40+
runs-on: ${{ matrix.vs == 'vs17' && 'windows-2022' || 'windows-2019' }}
4141

4242
env:
4343
PHP_VER: ${{ matrix.php }}
44-
VC: ${{ matrix.vc }}
44+
VS: ${{ matrix.vs }}
4545
ARCH: ${{ matrix.arch }}
4646
TS: ${{ matrix.ts }}
4747

@@ -73,7 +73,7 @@ jobs:
7373
- name: Store artifact DLL
7474
uses: actions/upload-artifact@v4
7575
with:
76-
name: php_${{ env.PHP_EXT }}-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.vc }}-${{ matrix.arch }}
76+
name: php_${{ env.PHP_EXT }}-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.vs }}-${{ matrix.arch }}
7777
path: .\php_${{ env.PHP_EXT }}.dll
7878
overwrite: true
7979
if: ${{ matrix.library == '' }}

0 commit comments

Comments
 (0)