Skip to content

Commit a128490

Browse files
committed
fix(ci): update appveyor image to have correct test binary location
- ensure caches are distinct per MinGW version - Avoid double-compiling source files by setting build directory for the test phase
1 parent b6b5548 commit a128490

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

.appveyor.yml

+10-3
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,15 @@ environment:
2020
- MINGW_ROOT: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64
2121
MINGW_VERSION: v8.1.0
2222

23+
matrix:
24+
fast_finish: true
25+
2326
install:
2427
# Update env variables to use the desired MinGW version
2528
- ps: |
2629
Set-AppveyorBuildVariable -Name PATH -Value "$Env:MINGW_ROOT\bin\;$Env:PATH";
2730
Set-AppveyorBuildVariable -Name DIR_MINGW64 -Value "$Env:MINGW_ROOT\x86_64-w64-mingw32";
31+
Set-AppveyorBuildVariable -Name SCCACHE_C_CUSTOM_CACHE_BUSTER -Value "$Env:MINGW_VERSION"
2832
# Ensure we have the precompiled libraries to link with (SDL, etc.).
2933
- ps: |
3034
if (!(Test-Path 'C:\dev64')) { New-Item 'C:\dev64' -ItemType Directory; }
@@ -49,19 +53,22 @@ build_script:
4953
- ps: mingw32-make.exe -re -j2 -f .winmake $Env:es_run_mode;
5054

5155
before_test:
52-
- ps: mingw32-make.exe -re -j2 -f .winmake build-tests;
56+
- ps: |
57+
Set-AppveyorBuildVariable -Name BUILDDIR -Value "build/pkgd"
58+
mingw32-make.exe -re -j2 -f .winmake build-tests;
5359
- ps: |
5460
$here = (Get-Location).Path;
5561
Copy-Item -Path "bin\pkgd\release\endless-sky.exe" -Destination $here;
5662
Copy-Item -Path "C:\dev64\bin\*.dll" -Exclude "libstdc*" -Destination $here;
5763
5864
test_script:
59-
- ps: .\tests\endless-sky-tests.exe -n es-ci -i --warn NoAssertions --order rand --rng-seed 'time' --filenames-as-tags -r junit -o $Env:TEST_REPORT_FILE;
60-
- ps: .\tests\test_parse.ps1 'endless-sky.exe';
65+
- ps: .\tests\unit\endless-sky-tests.exe -n es-ci -i --warn NoAssertions --order rand --rng-seed 'time' --filenames-as-tags -r junit -o $Env:TEST_REPORT_FILE;
66+
- ps: .\utils\test_parse.ps1 'endless-sky.exe';
6167

6268
# Upload the build if tests passed.
6369
after_test:
6470
- ps: |
71+
sccache --show-stats
6572
$here = (Get-Location).Path;
6673
Copy-Item -Path "$Env:DIR_MINGW64\lib\libstdc++-6.dll" -Destination $here;
6774
Copy-Item -Path "$Env:DIR_MINGW64\lib\libgcc_s_seh-1.dll" -Destination $here;

0 commit comments

Comments
 (0)