Skip to content

Commit 90f514c

Browse files
committed
Add Windows build to nightly
Also stop running 32-bit in push, it's really not necessary.
1 parent 0e843c5 commit 90f514c

File tree

3 files changed

+60
-26
lines changed

3 files changed

+60
-26
lines changed
+18
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

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

.github/workflows/push.yml

+7-26
Original file line numberDiff line numberDiff line change
@@ -154,45 +154,26 @@ jobs:
154154
- name: Verify generated files are up to date
155155
uses: ./.github/actions/verify-generated-files
156156
WINDOWS:
157-
strategy:
158-
fail-fast: false
159-
matrix:
160-
include:
161-
- x64: true
162-
zts: false
163-
opcache: true
164-
- x64: false
165-
zts: true
166-
opcache: false
167-
name: "WINDOWS_${{ matrix.x64 && 'X64' || 'X86' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
157+
name: WINDOWS_X64_ZTS
168158
runs-on: windows-2019
169159
env:
170160
PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
171161
PHP_BUILD_OBJ_DIR: C:\obj
172162
PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
173163
PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0
174164
PHP_BUILD_CRT: vs16
175-
PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }}
176-
THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"
177-
INTRINSICS: "${{ matrix.zts && 'AVX2' || '' }}"
165+
PLATFORM: x64
166+
THREAD_SAFE: "1"
167+
INTRINSICS: AVX2
178168
PARALLEL: -j2
179-
OPCACHE: "${{ matrix.opcache && '1' || '0' }}"
169+
OPCACHE: "1"
180170
steps:
181171
- name: git config
182172
run: git config --global core.autocrlf false && git config --global core.eol lf
183173
- name: git checkout
184174
uses: actions/checkout@v3
185-
- name: Setup MySQL
186-
run: |
187-
choco install mysql -y --no-progress --params="/port:3306"
188-
mysql.exe --port=3306 --user=root --password="" -e "ALTER USER 'root'@'localhost' IDENTIFIED BY 'Password12!'; FLUSH PRIVILEGES;"
189-
- name: Setup MSSQL
190-
run: |
191-
choco install sql-server-express -y --no-progress --install-arguments="/SECURITYMODE=SQL /SAPWD=Password12!"
192-
- name: Setup PostgreSQL
193-
run: |
194-
Set-Service -Name "postgresql-x64-14" -StartupType manual -Status Running
195-
pwsh -Command { $env:PGPASSWORD="root"; & "$env:PGBIN\psql" -U postgres -c "ALTER USER postgres WITH PASSWORD 'Password12!';" }
175+
- name: Setup
176+
uses: ./.github/actions/setup-windows
196177
- name: Build
197178
run: .github/scripts/windows/build.bat
198179
- name: Test

0 commit comments

Comments
 (0)