Skip to content

Commit 4ac326e

Browse files
iluuu1994iluuu1994
committed
Migrate Windows builds to GitHub actions
1 parent 33cd61c commit 4ac326e

File tree

5 files changed

+94
-62
lines changed

5 files changed

+94
-62
lines changed

‎appveyor/build.bat renamed to ‎.github/scripts/windows/build.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ if not exist "%SDK_RUNNER%" (
3838
exit /b 3
3939
)
4040

41-
cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\build_task.bat
41+
cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\.github\scripts\windows\build_task.bat
4242
if %errorlevel% neq 0 exit /b 3
4343

4444
exit /b 0

‎appveyor/build_task.bat renamed to ‎.github/scripts/windows/build_task.bat

File renamed without changes.

‎appveyor/test.bat renamed to ‎.github/scripts/windows/test.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if not exist "%SDK_RUNNER%" (
66
exit /b 3
77
)
88

9-
cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\test_task.bat
9+
cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\.github\scripts\windows\test_task.bat
1010
if %errorlevel% neq 0 exit /b 3
1111

1212
exit /b 0

‎appveyor/test_task.bat renamed to ‎.github/scripts/windows/test_task.bat

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,12 @@ nmake test TESTS="%OPCACHE_OPTS% -q --offline --show-diff --show-slow 1000 --set
116116

117117
set EXIT_CODE=%errorlevel%
118118

119-
appveyor PushArtifact %TEST_PHP_JUNIT%
119+
@REM appveyor PushArtifact %TEST_PHP_JUNIT%
120120

121-
if %EXIT_CODE% GEQ 1 (
122-
git checkout ext\pgsql\tests\config.inc
123-
git diff > bless_tests.patch
124-
appveyor PushArtifact bless_tests.patch
125-
)
121+
@REM if %EXIT_CODE% GEQ 1 (
122+
@REM git checkout ext\pgsql\tests\config.inc
123+
@REM git diff > bless_tests.patch
124+
@REM appveyor PushArtifact bless_tests.patch
125+
@REM )
126126

127127
exit /b %EXIT_CODE%

‎.github/workflows/push.yml

Lines changed: 86 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -18,65 +18,97 @@ on:
1818
branches:
1919
- '**'
2020
jobs:
21-
LINUX_X64:
21+
# LINUX_X64:
22+
# strategy:
23+
# fail-fast: false
24+
# matrix:
25+
# include:
26+
# - debug: true
27+
# zts: false
28+
# - debug: false
29+
# zts: true
30+
# name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
31+
# runs-on: ubuntu-20.04
32+
# steps:
33+
# - name: git checkout
34+
# uses: actions/checkout@v2
35+
# - name: Create mssql container
36+
# uses: ./.github/actions/mssql
37+
# - name: apt
38+
# uses: ./.github/actions/apt-x64
39+
# - name: ./configure
40+
# uses: ./.github/actions/configure-x64
41+
# with:
42+
# configurationParameters: >-
43+
# --${{ matrix.debug && 'enable' || 'disable' }}-debug
44+
# --${{ matrix.zts && 'enable' || 'disable' }}-zts
45+
# - name: make
46+
# run: make -j$(/usr/bin/nproc) >/dev/null
47+
# - name: make install
48+
# uses: ./.github/actions/install-linux
49+
# - name: Setup
50+
# uses: ./.github/actions/setup-x64
51+
# - name: Test
52+
# uses: ./.github/actions/test-linux
53+
# - name: Test Tracing JIT
54+
# uses: ./.github/actions/test-linux
55+
# with:
56+
# runTestsParameters: -d zend_extension=opcache.so -d opcache.jit_buffer_size=16M
57+
# MACOS_DEBUG_NTS:
58+
# runs-on: macos-10.15
59+
# steps:
60+
# - name: git checkout
61+
# uses: actions/checkout@v2
62+
# - name: brew
63+
# uses: ./.github/actions/brew
64+
# - name: ./configure
65+
# uses: ./.github/actions/configure-macos
66+
# with:
67+
# configurationParameters: --enable-debug --disable-zts
68+
# - name: make
69+
# run: |-
70+
# export PATH="/usr/local/opt/bison/bin:$PATH"
71+
# make -j$(sysctl -n hw.logicalcpu) >/dev/null
72+
# - name: make install
73+
# run: sudo make install
74+
# - name: Test
75+
# uses: ./.github/actions/test-macos
76+
# - name: Test Tracing JIT
77+
# uses: ./.github/actions/test-macos
78+
# with:
79+
# runTestsParameters: >-
80+
# -d zend_extension=opcache.so
81+
# -d opcache.protect_memory=1
82+
# -d opcache.jit_buffer_size=16M
83+
WINDOWS_X64:
2284
strategy:
2385
fail-fast: false
2486
matrix:
2587
include:
26-
- debug: true
27-
zts: false
28-
- debug: false
29-
zts: true
30-
name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
31-
runs-on: ubuntu-20.04
88+
- zts: false
89+
opcache: false
90+
- zts: true
91+
opcache: true
92+
intrinsics: AVX
93+
runs-on: windows-2019
94+
env:
95+
PHP_BUILD_CACHE_BASE_DIR: c:\build-cache
96+
PHP_BUILD_OBJ_DIR: c:\obj
97+
PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
98+
PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0
99+
PHP_BUILD_CRT: vs16
100+
THREAD_SAFE: ${{ matrix.zts && 1 || 0 }}
101+
OPCACHE: ${{ matrix.opcache && 1 || 0 }}
102+
PARALLEL: -j2
103+
INTRINSICS: ${{ matrix.intrinsics }}
104+
PLATFORM: x64
105+
APPVEYOR: true
106+
APPVEYOR_BUILD_FOLDER: ${{ env.GITHUB_WORKSPACE }}
107+
APPVEYOR_REPO_BRANCH: ${{ env.GITHUB_BASE_REF }}
32108
steps:
33109
- name: git checkout
34110
uses: actions/checkout@v2
35-
- name: Create mssql container
36-
uses: ./.github/actions/mssql
37-
- name: apt
38-
uses: ./.github/actions/apt-x64
39-
- name: ./configure
40-
uses: ./.github/actions/configure-x64
41-
with:
42-
configurationParameters: >-
43-
--${{ matrix.debug && 'enable' || 'disable' }}-debug
44-
--${{ matrix.zts && 'enable' || 'disable' }}-zts
45-
- name: make
46-
run: make -j$(/usr/bin/nproc) >/dev/null
47-
- name: make install
48-
uses: ./.github/actions/install-linux
49-
- name: Setup
50-
uses: ./.github/actions/setup-x64
111+
- name: Build
112+
run: .\.github\scripts\windows\build.bat
51113
- name: Test
52-
uses: ./.github/actions/test-linux
53-
- name: Test Tracing JIT
54-
uses: ./.github/actions/test-linux
55-
with:
56-
runTestsParameters: -d zend_extension=opcache.so -d opcache.jit_buffer_size=16M
57-
MACOS_DEBUG_NTS:
58-
runs-on: macos-10.15
59-
steps:
60-
- name: git checkout
61-
uses: actions/checkout@v2
62-
- name: brew
63-
uses: ./.github/actions/brew
64-
- name: ./configure
65-
uses: ./.github/actions/configure-macos
66-
with:
67-
configurationParameters: --enable-debug --disable-zts
68-
- name: make
69-
run: |-
70-
export PATH="/usr/local/opt/bison/bin:$PATH"
71-
make -j$(sysctl -n hw.logicalcpu) >/dev/null
72-
- name: make install
73-
run: sudo make install
74-
- name: Test
75-
uses: ./.github/actions/test-macos
76-
- name: Test Tracing JIT
77-
uses: ./.github/actions/test-macos
78-
with:
79-
runTestsParameters: >-
80-
-d zend_extension=opcache.so
81-
-d opcache.protect_memory=1
82-
-d opcache.jit_buffer_size=16M
114+
run: .\.github\scripts\windows\test.bat

0 commit comments

Comments
 (0)