Skip to content

Re-introduce caching for Windows CI #16044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Re-introduce caching for Windows CI #16044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/windows/build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 .github\scripts\windows\build_task.bat --task-args %1
if %errorlevel% neq 0 exit /b 3

exit /b 0
3 changes: 2 additions & 1 deletion .github/scripts/windows/build_task.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ if /i "%GITHUB_ACTIONS%" neq "True" (
exit /b 3
)

set BRANCH=%1

del /f /q C:\Windows\System32\libcrypto-1_1-x64.dll >NUL 2>NUL
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
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
Expand Down
2 changes: 2 additions & 0 deletions .github/scripts/windows/find-target-branch.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ for /f "usebackq tokens=3" %%i in (`findstr PHP_MINOR_VERSION main\php_version.h
if /i "%BRANCH%" equ "8.5" (
set BRANCH=master
)

echo branch=%BRANCH%>> %GITHUB_OUTPUT%
2 changes: 1 addition & 1 deletion .github/scripts/windows/test.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if not exist "%SDK_RUNNER%" (
exit /b 3
)

cmd /c %SDK_RUNNER% -t .github\scripts\windows\test_task.bat
cmd /c %SDK_RUNNER% -t .github\scripts\windows\test_task.bat --task-args %1
if %errorlevel% neq 0 exit /b 3

exit /b 0
8 changes: 2 additions & 6 deletions .github/scripts/windows/test_task.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,12 @@ if /i "%GITHUB_ACTIONS%" neq "True" (
exit /b 3
)

set BRANCH=%1

set NO_INTERACTION=1
set REPORT_EXIT_STATUS=1
set SKIP_IO_CAPTURE_TESTS=1

call %~dp0find-target-branch.bat
if "%BRANCH%" neq "master" (
set STABILITY=stable
) else (
set STABILITY=staging
)
set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%BRANCH%-%PHP_SDK_VS%-%PHP_SDK_ARCH%
if not exist "%DEPS_DIR%" (
echo "%DEPS_DIR%" doesn't exist
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,10 +247,18 @@ jobs:
uses: actions/checkout@v4
- name: Setup
uses: ./.github/actions/setup-windows
- name: Find target branch
id: branch
run: .github/scripts/windows/find-target-branch.bat
- name: Cache
uses: actions/cache@v4
with:
key: ${{ env.PHP_BUILD_SDK_BRANCH }}-deps-${{ steps.branch.outputs.branch }}-${{ env.PHP_BUILD_CRT }}-${{ env.PLATFORM }}
path: ${{ env.PHP_BUILD_CACHE_BASE_DIR }}
- name: Build
run: .github/scripts/windows/build.bat
run: .github/scripts/windows/build.bat ${{ steps.branch.outputs.branch }}
- name: Test
run: .github/scripts/windows/test.bat
run: .github/scripts/windows/test.bat ${{ steps.branch.outputs.branch }}
BENCHMARKING:
name: BENCHMARKING
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
Expand Down