fix: iterate psql setup

Author: Lewiscowles1986

.github/actions/setup-windows/action.yml

@@ -18,6 +18,5 @@ runs:
       run: |
         Set-Service -Name "postgresql-x64-14" -StartupType manual -Status Running
         pwsh -Command { $env:PGPASSWORD="root"; & "$env:PGBIN\psql" -U postgres -c "ALTER USER postgres WITH PASSWORD 'Password12!';" }
-        pwsh -Command { $env:PGPASSWORD="root"; & "$env:PGBIN\psql" -U postgres -c "DROP SCHEMA IF EXISTS test;" }
-        pwsh -Command { $env:PGPASSWORD="root"; & "$env:PGBIN\psql" -U postgres -c "CREATE SCHEMA IF NOT EXISTS test;" }
-    - name: Setup 
+        pwsh -Command { $env:PGPASSWORD="Password12!"; & "$env:PGBIN\psql" -U postgres -c "DROP SCHEMA IF EXISTS test;" }
+        pwsh -Command { $env:PGPASSWORD="Password12!"; & "$env:PGBIN\psql" -U postgres -c "CREATE SCHEMA IF NOT EXISTS test;" }

.github/workflows/nightly.yml

@@ -883,6 +883,8 @@ jobs:
           ref: ${{ matrix.branch.ref }}
       - name: Setup
         uses: ./.github/actions/setup-windows
+      - name: Environment
+        run: ./scripts/windows/env.bat
       - name: Build
         run: ./scripts/windows/build.bat
       - name: Test

.github/workflows/push.yml

@@ -188,6 +188,8 @@ jobs:
         uses: actions/checkout@v4
       - name: Setup
         uses: ./.github/actions/setup-windows
+      - name: Environment
+        run: ./scripts/windows/env.bat
       - name: Build
         run: ./scripts/windows/build.bat
       - name: Test

scripts/windows/build.bat

@@ -41,7 +41,7 @@ if not exist "%SDK_RUNNER%" (
 	exit /b 3
 )
 
-cmd /c %SDK_RUNNER% -t .github\scripts\windows\build_task.bat
+cmd /c %SDK_RUNNER% -t %WIN_SCRIPTS_DIR%\build_task.bat
 if %errorlevel% neq 0 exit /b 3
 
 exit /b 0

scripts/windows/build_task.bat

@@ -10,7 +10,7 @@ if %errorlevel% neq 0 exit /b 3
 del /f /q C:\Windows\System32\libssl-1_1-x64.dll >NUL 2>NUL
 if %errorlevel% neq 0 exit /b 3
 
-call %~dp0find-target-branch.bat
+call %WIN_SCRIPTS_DIR%\find-target-branch.bat
 set STABILITY=staging
 set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%BRANCH%-%PHP_SDK_VS%-%PHP_SDK_ARCH%
 rem SDK is cached, deps info is cached as well

scripts/windows/env.bat

@@ -1,16 +1,20 @@
 @echo off
 
-set PHP_BUILD_CACHE_BASE_DIR=C:\build-cache
-set PHP_BUILD_OBJ_DIR=C:\obj
-set PHP_BUILD_CACHE_SDK_DIR=C:\build-cache\sdk
-set PHP_BUILD_SDK_BRANCH=php_src-2.2.1-dev
-set PHP_BUILD_CRT=vs16
-set PLATFORM=x64
-set THREAD_SAFE=1
-set INTRINSICS=AVX2
-set PARALLEL= -j2
-set OPCACHE=1
+setx WIN_SCRIPTS_DIR %~dp0
+setx SCRIPT_DRIVE %~d0
 
-set CI=True
-set BRANCH=master
+if /i "%LOCALBUILD%" equ "True" (
+    setx PHP_BUILD_CACHE_BASE_DIR C:\build-cache
+    setx PHP_BUILD_OBJ_DIR C:\obj
+    setx PHP_BUILD_CACHE_SDK_DIR C:\build-cache\sdk
+    setx PHP_BUILD_SDK_BRANCH php_src-2.2.1-dev
+    setx PHP_BUILD_CRT vs16
+    setx PLATFORM x64
+    setx THREAD_SAFE 1
+    setx INTRINSICS AVX2
+    setx PARALLEL  -j2
+    setx OPCACHE 1
 
+    setx CI True
+    setx BRANCH master
+)

scripts/windows/test.bat

@@ -3,17 +3,14 @@ if /i "%CI%" neq "True" (
     exit /b 3
 )
 
-set WIN_SCRIPTS_DIR=%~dp0
-set SCRIPT_DRIVE=%~d0
-
 set SDK_RUNNER=%PHP_BUILD_CACHE_SDK_DIR%\phpsdk-%PHP_BUILD_CRT%-%PLATFORM%.bat
 rem SDK_RUNNER=%PHP_BUILD_CACHE_SDK_DIR%\phpsdk-%PHP_BUILD_CRT%-%PLATFORM%.bat
 if not exist "%SDK_RUNNER%" (
 	echo "%SDK_RUNNER%" doesn't exist
 	exit /b 3
 )
 
-cmd /c %SDK_RUNNER% -t .github\scripts\windows\test_task.bat
+cmd /c %SDK_RUNNER% -t %WIN_SCRIPTS_DIR%\test_task.bat
 if %errorlevel% neq 0 exit /b 3
 
 exit /b 0