Skip to content

Commit fa8b4e1

Browse files
committed
Merge branch 'PHP-8.2'
* PHP-8.2: Add Windows build to nightly
2 parents 2b2d2b0 + b234235 commit fa8b4e1

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
@@ -836,3 +836,38 @@ jobs:
836836
uses: ./.github/actions/notify-slack
837837
with:
838838
token: ${{ secrets.ACTION_MONITORING_SLACK }}
839+
WINDOWS:
840+
strategy:
841+
fail-fast: false
842+
matrix:
843+
include:
844+
- x64: true
845+
zts: true
846+
opcache: true
847+
- x64: false
848+
zts: false
849+
opcache: false
850+
name: "WINDOWS_${{ matrix.x64 && 'X64' || 'X86' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
851+
runs-on: windows-2019
852+
env:
853+
PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
854+
PHP_BUILD_OBJ_DIR: C:\obj
855+
PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
856+
PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0
857+
PHP_BUILD_CRT: vs16
858+
PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }}
859+
THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"
860+
INTRINSICS: "${{ matrix.zts && 'AVX2' || '' }}"
861+
PARALLEL: -j2
862+
OPCACHE: "${{ matrix.opcache && '1' || '0' }}"
863+
steps:
864+
- name: git config
865+
run: git config --global core.autocrlf false && git config --global core.eol lf
866+
- name: git checkout
867+
uses: actions/checkout@v3
868+
- name: Setup
869+
uses: ./.github/actions/setup-windows
870+
- name: Build
871+
run: .github/scripts/windows/build.bat
872+
- name: Test
873+
run: .github/scripts/windows/test.bat

.github/workflows/push.yml

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -184,45 +184,26 @@ jobs:
184184
- name: Verify generated files are up to date
185185
uses: ./.github/actions/verify-generated-files
186186
WINDOWS:
187-
strategy:
188-
fail-fast: false
189-
matrix:
190-
include:
191-
- x64: true
192-
zts: false
193-
opcache: true
194-
- x64: false
195-
zts: true
196-
opcache: false
197-
name: "WINDOWS_${{ matrix.x64 && 'X64' || 'X86' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
187+
name: WINDOWS_X64_ZTS
198188
runs-on: windows-2019
199189
env:
200190
PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
201191
PHP_BUILD_OBJ_DIR: C:\obj
202192
PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
203193
PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0
204194
PHP_BUILD_CRT: vs16
205-
PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }}
206-
THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"
207-
INTRINSICS: "${{ matrix.zts && 'AVX2' || '' }}"
195+
PLATFORM: x64
196+
THREAD_SAFE: "1"
197+
INTRINSICS: AVX2
208198
PARALLEL: -j2
209-
OPCACHE: "${{ matrix.opcache && '1' || '0' }}"
199+
OPCACHE: "1"
210200
steps:
211201
- name: git config
212202
run: git config --global core.autocrlf false && git config --global core.eol lf
213203
- name: git checkout
214204
uses: actions/checkout@v3
215-
- name: Setup MySQL
216-
run: |
217-
choco install mysql -y --no-progress --params="/port:3306"
218-
mysql.exe --port=3306 --user=root --password="" -e "ALTER USER 'root'@'localhost' IDENTIFIED BY 'Password12!'; FLUSH PRIVILEGES;"
219-
- name: Setup MSSQL
220-
run: |
221-
choco install sql-server-express -y --no-progress --install-arguments="/SECURITYMODE=SQL /SAPWD=Password12!"
222-
- name: Setup PostgreSQL
223-
run: |
224-
Set-Service -Name "postgresql-x64-14" -StartupType manual -Status Running
225-
pwsh -Command { $env:PGPASSWORD="root"; & "$env:PGBIN\psql" -U postgres -c "ALTER USER postgres WITH PASSWORD 'Password12!';" }
205+
- name: Setup
206+
uses: ./.github/actions/setup-windows
226207
- name: Build
227208
run: .github/scripts/windows/build.bat
228209
- name: Test

0 commit comments

Comments
 (0)