Skip to content

Commit b234235

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Add Windows build to nightly
2 parents 1aae59c + 90f514c commit b234235

File tree

3 files changed

+60
-26
lines changed

3 files changed

+60
-26
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Setup
2+
runs:
3+
using: composite
4+
steps:
5+
- name: Setup MySQL
6+
shell: pwsh
7+
run: |
8+
choco install mysql -y --no-progress --params="/port:3306"
9+
mysql.exe --port=3306 --user=root --password="" -e "ALTER USER 'root'@'localhost' IDENTIFIED BY 'Password12!'; FLUSH PRIVILEGES;"
10+
- name: Setup MSSQL
11+
shell: pwsh
12+
run: |
13+
choco install sql-server-express -y --no-progress --install-arguments="/SECURITYMODE=SQL /SAPWD=Password12!"
14+
- name: Setup PostgreSQL
15+
shell: pwsh
16+
run: |
17+
Set-Service -Name "postgresql-x64-14" -StartupType manual -Status Running
18+
pwsh -Command { $env:PGPASSWORD="root"; & "$env:PGBIN\psql" -U postgres -c "ALTER USER postgres WITH PASSWORD 'Password12!';" }

.github/workflows/nightly.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -654,3 +654,38 @@ jobs:
654654
uses: ./.github/actions/notify-slack
655655
with:
656656
token: ${{ secrets.ACTION_MONITORING_SLACK }}
657+
WINDOWS:
658+
strategy:
659+
fail-fast: false
660+
matrix:
661+
include:
662+
- x64: true
663+
zts: true
664+
opcache: true
665+
- x64: false
666+
zts: false
667+
opcache: false
668+
name: "WINDOWS_${{ matrix.x64 && 'X64' || 'X86' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
669+
runs-on: windows-2019
670+
env:
671+
PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
672+
PHP_BUILD_OBJ_DIR: C:\obj
673+
PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
674+
PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0
675+
PHP_BUILD_CRT: vs16
676+
PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }}
677+
THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"
678+
INTRINSICS: "${{ matrix.zts && 'AVX2' || '' }}"
679+
PARALLEL: -j2
680+
OPCACHE: "${{ matrix.opcache && '1' || '0' }}"
681+
steps:
682+
- name: git config
683+
run: git config --global core.autocrlf false && git config --global core.eol lf
684+
- name: git checkout
685+
uses: actions/checkout@v3
686+
- name: Setup
687+
uses: ./.github/actions/setup-windows
688+
- name: Build
689+
run: .github/scripts/windows/build.bat
690+
- name: Test
691+
run: .github/scripts/windows/test.bat

.github/workflows/push.yml

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -159,45 +159,26 @@ jobs:
159159
- name: Verify generated files are up to date
160160
uses: ./.github/actions/verify-generated-files
161161
WINDOWS:
162-
strategy:
163-
fail-fast: false
164-
matrix:
165-
include:
166-
- x64: true
167-
zts: false
168-
opcache: true
169-
- x64: false
170-
zts: true
171-
opcache: false
172-
name: "WINDOWS_${{ matrix.x64 && 'X64' || 'X86' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
162+
name: WINDOWS_X64_ZTS
173163
runs-on: windows-2019
174164
env:
175165
PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
176166
PHP_BUILD_OBJ_DIR: C:\obj
177167
PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
178168
PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0
179169
PHP_BUILD_CRT: vs16
180-
PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }}
181-
THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"
182-
INTRINSICS: "${{ matrix.zts && 'AVX2' || '' }}"
170+
PLATFORM: x64
171+
THREAD_SAFE: "1"
172+
INTRINSICS: AVX2
183173
PARALLEL: -j2
184-
OPCACHE: "${{ matrix.opcache && '1' || '0' }}"
174+
OPCACHE: "1"
185175
steps:
186176
- name: git config
187177
run: git config --global core.autocrlf false && git config --global core.eol lf
188178
- name: git checkout
189179
uses: actions/checkout@v3
190-
- name: Setup MySQL
191-
run: |
192-
choco install mysql -y --no-progress --params="/port:3306"
193-
mysql.exe --port=3306 --user=root --password="" -e "ALTER USER 'root'@'localhost' IDENTIFIED BY 'Password12!'; FLUSH PRIVILEGES;"
194-
- name: Setup MSSQL
195-
run: |
196-
choco install sql-server-express -y --no-progress --install-arguments="/SECURITYMODE=SQL /SAPWD=Password12!"
197-
- name: Setup PostgreSQL
198-
run: |
199-
Set-Service -Name "postgresql-x64-14" -StartupType manual -Status Running
200-
pwsh -Command { $env:PGPASSWORD="root"; & "$env:PGBIN\psql" -U postgres -c "ALTER USER postgres WITH PASSWORD 'Password12!';" }
180+
- name: Setup
181+
uses: ./.github/actions/setup-windows
201182
- name: Build
202183
run: .github/scripts/windows/build.bat
203184
- name: Test

0 commit comments

Comments
 (0)