Skip to content

Commit c53aa0e

Browse files
committed
Fix branch variable and test errors
1 parent f708d6d commit c53aa0e

File tree

5 files changed

+21
-13
lines changed

5 files changed

+21
-13
lines changed

.github/scripts/windows/find-target-branch.bat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@
22

33
for /f "usebackq tokens=3" %%i in (`findstr PHP_MAJOR_VERSION main\php_version.h`) do set BRANCH=%%i
44
for /f "usebackq tokens=3" %%i in (`findstr PHP_MINOR_VERSION main\php_version.h`) do set BRANCH=%BRANCH%.%%i
5+
6+
if /i "%BRANCH%" equ "8.3" (
7+
set BRANCH=master
8+
)

.github/workflows/push.yml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ env:
2525
CXX: ccache g++
2626
jobs:
2727
LINUX_X64:
28+
if: false
2829
strategy:
2930
fail-fast: false
3031
matrix:
@@ -79,6 +80,7 @@ jobs:
7980
- name: Verify generated files are up to date
8081
uses: ./.github/actions/verify-generated-files
8182
LINUX_X32:
83+
if: false
8284
name: LINUX_X32_DEBUG_ZTS
8385
runs-on: ubuntu-latest
8486
container:
@@ -125,6 +127,7 @@ jobs:
125127
-d opcache.enable_cli=1
126128
-d opcache.jit_buffer_size=16M
127129
MACOS_DEBUG_NTS:
130+
if: false
128131
runs-on: macos-11
129132
steps:
130133
- name: git checkout
@@ -187,17 +190,17 @@ jobs:
187190
run: git config --global core.autocrlf false && git config --global core.eol lf
188191
- name: git checkout
189192
uses: actions/checkout@v2
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!';" }
193+
# - name: Setup MySQL
194+
# run: |
195+
# choco install mysql -y --no-progress --params="/port:3306"
196+
# mysql.exe --port=3306 --user=root --password="" -e "ALTER USER 'root'@'localhost' IDENTIFIED BY 'Password12!'; FLUSH PRIVILEGES;"
197+
# - name: Setup MSSQL
198+
# run: |
199+
# choco install sql-server-express -y --no-progress --install-arguments="/SECURITYMODE=SQL /SAPWD=Password12!"
200+
# - name: Setup PostgreSQL
201+
# run: |
202+
# Set-Service -Name "postgresql-x64-14" -StartupType manual -Status Running
203+
# pwsh -Command { $env:PGPASSWORD="root"; & "$env:PGBIN\psql" -U postgres -c "ALTER USER postgres WITH PASSWORD 'Password12!';" }
201204
- name: Build
202205
run: .github/scripts/windows/build.bat
203206
- name: Test

ext/mbstring/tests/utf_encodings.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ mbstring
55
--SKIPIF--
66
<?php
77
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
8+
if (substr(PHP_OS, 0, 3) == 'WIN' && PHP_INT_SIZE === 4) die("skip not for Windows x86");
89
?>
910
--FILE--
1011
<?php

ext/pdo_sqlite/tests/pdo_sqlite_open_basedir_uri.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PDO_sqlite: Testing URIs with open_basedir
33
--EXTENSIONS--
44
pdo_sqlite
55
--INI--
6-
open_basedir={TMP}
6+
open_basedir="{TMP}"
77
--FILE--
88
<?php
99

ext/zend_test/tests/observer_declarations_file_cache.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ zend_test
66
zend_test.observer.enabled=1
77
zend_test.observer.observe_declaring=1
88
opcache.enable_cli=1
9-
opcache.file_cache={TMP}
9+
opcache.file_cache="{TMP}"
1010
opcache.file_cache_only=1
1111
--FILE--
1212
<?php

0 commit comments

Comments
 (0)