Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Windows CI #89

Merged
merged 5 commits into from
Sep 30, 2024
Merged

Update Windows CI #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73ee062
Update setup-php-sdk to v0.10 and enable caching
cmb69 Sep 30, 2024
1f26a08
Update AppVeyor CI
cmb69 Sep 30, 2024
f6302f3
Fix AppVeyor builds
cmb69 Sep 30, 2024
a60f11d
Add jobs for PHP 8.4 (requires to use windows-2022 runners)
cmb69 Sep 30, 2024
1ea795e
Don't be picky about the VS version
cmb69 Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,34 @@ cache:
- c:\build-cache -> .appveyor.yml, .appveyor\install.ps1

environment:
BIN_SDK_VER: 2.2.0
BIN_SDK_VER: 2.3.0
matrix:
- PHP_VER: 7.2.30
- PHP_VER: 7.2.34
ARCH: x64
TS: 1
VC: vc15
DEP: libyaml-0.1.7
- PHP_VER: 7.2.30
- PHP_VER: 7.2.34
ARCH: x86
TS: 0
VC: vc15
DEP: libyaml-0.1.7
- PHP_VER: 7.3.17
- PHP_VER: 7.3.33
ARCH: x64
TS: 1
VC: vc15
DEP: libyaml-0.1.7
- PHP_VER: 7.3.17
- PHP_VER: 7.3.33
ARCH: x86
TS: 0
VC: vc15
DEP: libyaml-0.1.7
- PHP_VER: 7.4.5
- PHP_VER: 7.4.33
ARCH: x64
TS: 1
VC: vc15
DEP: libyaml-0.1.7
- PHP_VER: 7.4.5
- PHP_VER: 7.4.33
ARCH: x86
TS: 0
VC: vc15
Expand Down
31 changes: 19 additions & 12 deletions .appveyor/install.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
if (-not (Test-Path c:\build-cache)) {
mkdir c:\build-cache
}

if ($env:PHP_VER -lt "7.4") {
$vc = $env:VC.toUpper()
} else {
$vc = $env:VC
}

$bname = 'php-sdk-' + $env:BIN_SDK_VER + '.zip'
if (-not (Test-Path c:\build-cache\$bname)) {
Invoke-WebRequest "https://github.com/microsoft/php-sdk-binary-tools/archive/$bname" -OutFile "c:\build-cache\$bname"
Invoke-WebRequest "https://github.com/php/php-sdk-binary-tools/archive/$bname" -OutFile "c:\build-cache\$bname"
}
$dname0 = 'php-sdk-binary-tools-php-sdk-' + $env:BIN_SDK_VER
$dname1 = 'php-sdk-' + $env:BIN_SDK_VER
Expand All @@ -13,15 +20,15 @@ if (-not (Test-Path c:\build-cache\$dname1)) {
}
$ts_part = ''
if ('0' -eq $env:TS) { $ts_part = '-nts' }
$bname = 'php-devel-pack-' + $env:PHP_VER + $ts_part + '-Win32-' + $env:VC.toUpper() + '-' + $env:ARCH + '.zip'
$bname = 'php-devel-pack-' + $env:PHP_VER + $ts_part + '-Win32-' + $vc + '-' + $env:ARCH + '.zip'
if (-not (Test-Path c:\build-cache\$bname)) {
Invoke-WebRequest "http://windows.php.net/downloads/releases/archives/$bname" -OutFile "c:\build-cache\$bname"
Invoke-WebRequest "https://downloads.php.net/~windows/releases/archives/$bname" -OutFile "c:\build-cache\$bname"
if (-not (Test-Path c:\build-cache\$bname)) {
Invoke-WebRequest "http://windows.php.net/downloads/releases/$bname" -OutFile "c:\build-cache\$bname"
Invoke-WebRequest "hhttps://downloads.php.net/~windows/releases/$bname" -OutFile "c:\build-cache\$bname"
}
}
$dname0 = 'php-' + $env:PHP_VER + '-devel-' + $env:VC.toUpper() + '-' + $env:ARCH
$dname1 = 'php-' + $env:PHP_VER + $ts_part + '-devel-' + $env:VC.toUpper() + '-' + $env:ARCH
$dname0 = 'php-' + $env:PHP_VER + '-devel-' + $vc + '-' + $env:ARCH
$dname1 = 'php-' + $env:PHP_VER + $ts_part + '-devel-' + $vc + '-' + $env:ARCH
if (-not (Test-Path c:\build-cache\$dname1)) {
7z x c:\build-cache\$bname -oc:\build-cache
if ($dname0 -ne $dname1) {
Expand All @@ -31,22 +38,22 @@ if (-not (Test-Path c:\build-cache\$dname1)) {
$env:PHP_DEVEL_PATH = 'c:\build-cache\' + $dname1
$env:PATH = $env:PHP_DEVEL_PATH + ';' + $env:PATH

$bname = 'php-' + $env:PHP_VER + $ts_part + '-Win32-' + $env:VC.toUpper() + '-' + $env:ARCH + '.zip'
$bname = 'php-' + $env:PHP_VER + $ts_part + '-Win32-' + $vc + '-' + $env:ARCH + '.zip'
if (-not (Test-Path c:\build-cache\$bname)) {
Invoke-WebRequest "http://windows.php.net/downloads/releases/archives/$bname" -OutFile "c:\build-cache\$bname"
Invoke-WebRequest "https://downloads.php.net/~windows/releases/archives/$bname" -OutFile "c:\build-cache\$bname"
if (-not (Test-Path c:\build-cache\$bname)) {
Invoke-WebRequest "http://windows.php.net/downloads/releases/$bname" -OutFile "c:\build-cache\$bname"
Invoke-WebRequest "https://downloads.php.net/~windows/releases/$bname" -OutFile "c:\build-cache\$bname"
}
}
$dname = 'php-' + $env:PHP_VER + $ts_part + '-Win32-' + $env:VC.toUpper() + '-' + $env:ARCH
$dname = 'php-' + $env:PHP_VER + $ts_part + '-Win32-' + $vc + '-' + $env:ARCH
if (-not (Test-Path c:\build-cache\$dname)) {
7z x c:\build-cache\$bname -oc:\build-cache\$dname
}
$env:PHP_PATH = 'c:\build-cache\' + $dname
$env:PATH = $env:PHP_PATH + ';' + $env:PATH

$bname = $env:DEP + '-' + $env:VC.toUpper() + '-' + $env:ARCH + '.zip'
$bname = $env:DEP + '-' + $env:VC.toLower() + '-' + $env:ARCH + '.zip'
if (-not (Test-Path c:\build-cache\$bname)) {
Invoke-WebRequest "http://windows.php.net/downloads/pecl/deps/$bname" -OutFile "c:\build-cache\$bname"
Invoke-WebRequest "http://downloads.php.net/~windows/pecl/deps/$bname" -OutFile "c:\build-cache\$bname"
7z x c:\build-cache\$bname -oc:\build-cache\deps
}
9 changes: 4 additions & 5 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:

windows:
name: Windows
runs-on: windows-2019
runs-on: windows-2022

defaults:
run:
Expand All @@ -80,13 +80,12 @@ jobs:
- "8.1"
- "8.2"
- "8.3"
- "8.4"
arch:
- "x64"
ts:
- nts
- ts
vsversion:
- "16.0"
libyaml:
- libyaml-0.1.7-vs16

Expand All @@ -97,11 +96,12 @@ jobs:
uses: actions/checkout@v3
- name: Setup PHP
id: setup-php
uses: php/setup-php-sdk@v0.8
uses: php/setup-php-sdk@v0.10
with:
version: "${{ matrix.php-version }}"
arch: "${{ matrix.arch }}"
ts: "${{ matrix.ts }}"
cache: true
- name: Download deps
run: |
curl -LO https://windows.php.net/downloads/pecl/deps/${{ matrix.libyaml }}-${{ matrix.arch }}.zip
Expand All @@ -112,7 +112,6 @@ jobs:
with:
arch: "${{ matrix.arch }}"
toolset: "${{ steps.setup-php.outputs.toolset }}"
vsversion: "${{ matrix.vsversion }}"
- name: Generate build files
run: phpize
- name: Configure build
Expand Down
Loading