Skip to content

Commit 334b1a1

Browse files
committed
clone is fast, cache not needed
1 parent af39e2d commit 334b1a1

File tree

4 files changed

+4
-23
lines changed

4 files changed

+4
-23
lines changed

.appveyor.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ skip_commits:
1111
- UPGRADING
1212
- UPGRADING.INTERNALS
1313

14-
cache:
15-
- c:\build-cache
16-
1714
environment:
1815
PHP_BUILD_CACHE_BASE_DIR: c:\build-cache
1916
PHP_BUILD_OBJ_DIR: c:\obj

.github/scripts/windows/build.bat

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,11 @@ set SDK_REMOTE=https://github.com/php/php-sdk-binary-tools.git
99
set SDK_BRANCH=%PHP_BUILD_SDK_BRANCH%
1010
set SDK_RUNNER=%PHP_BUILD_CACHE_SDK_DIR%\phpsdk-%PHP_BUILD_CRT%-%PLATFORM%.bat
1111

12-
if not exist "%PHP_BUILD_CACHE_BASE_DIR%" (
13-
echo Creating %PHP_BUILD_CACHE_BASE_DIR%
14-
mkdir "%PHP_BUILD_CACHE_BASE_DIR%"
15-
)
16-
17-
if not exist "%PHP_BUILD_OBJ_DIR%" (
18-
echo Creating %PHP_BUILD_OBJ_DIR%
19-
mkdir "%PHP_BUILD_OBJ_DIR%"
20-
)
12+
mkdir "%PHP_BUILD_CACHE_BASE_DIR%"
13+
mkdir "%PHP_BUILD_OBJ_DIR%"
2114

22-
if not exist "%SDK_RUNNER%" (
23-
if exist "%PHP_BUILD_CACHE_SDK_DIR%" rmdir /s /q "%PHP_BUILD_CACHE_SDK_DIR%"
24-
)
25-
26-
if not exist "%PHP_BUILD_CACHE_SDK_DIR%" (
27-
echo Cloning remote SDK repository
28-
git clone -q --branch %SDK_BRANCH% %SDK_REMOTE% --depth 1 "%PHP_BUILD_CACHE_SDK_DIR%" 2>&1
29-
)
15+
echo Cloning remote SDK repository
16+
git clone -q --branch %SDK_BRANCH% %SDK_REMOTE% --depth 1 "%PHP_BUILD_CACHE_SDK_DIR%" 2>&1
3017

3118
for /f "tokens=*" %%a in ('type %PHP_BUILD_CACHE_SDK_DIR%\VERSION') do set GOT_SDK_VER=%%a
3219
echo Got SDK version %GOT_SDK_VER%
@@ -39,4 +26,3 @@ if NOT "%GOT_SDK_VER%" == "%PHP_BUILD_SDK_BRANCH:~8%" (
3926
)
4027

4128
cmd /c %SDK_RUNNER% -t .github\scripts\windows\build_task.bat
42-
if %errorlevel% neq 0 exit /b 3

.github/scripts/windows/build_task.bat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,3 @@ cmd /c configure.bat ^
7878
if %errorlevel% neq 0 exit /b 3
7979

8080
nmake /NOLOGO /S
81-
if %errorlevel% neq 0 exit /b 3

.github/scripts/windows/test.bat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
88
set SDK_RUNNER=%PHP_BUILD_CACHE_SDK_DIR%\phpsdk-%PHP_BUILD_CRT%-%PLATFORM%.bat
99

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

0 commit comments

Comments
 (0)