diff options
Diffstat (limited to 'src/scripts')
| -rw-r--r-- | src/scripts/ci/appveyor.yml | 13 | ||||
| -rw-r--r-- | src/scripts/ci/setup_appveyor.bat | 7 |
2 files changed, 1 insertions, 19 deletions
diff --git a/src/scripts/ci/appveyor.yml b/src/scripts/ci/appveyor.yml index ff1e38598..26a977ad1 100644 --- a/src/scripts/ci/appveyor.yml +++ b/src/scripts/ci/appveyor.yml @@ -6,18 +6,11 @@ # 2. MSVC2017 static lib with with amalgamation # 3. MSVC2017 with debug/sanitizers # 4. MSVC2015 for Windows RT (TODO) -# -# Note: Avoid the AppVeyor settings `platform` and `configuration` since excluding -# from the build matrix is not supported (https://github.com/appveyor/ci/issues/386) clone_depth: 5 environment: - CLCACHE_HARDLINK: 1 - CLCACHE_NODIRECT: 1 - APPVEYOR_CACHE_ENTRY_ZIP_ARGS: -t7z -m0=lzma -mx=9 - matrix: # 1 - MSVS: 2013 @@ -63,14 +56,10 @@ install: - call src\scripts\ci\setup_appveyor.bat build_script: - - python src\scripts\ci_build.py --os=windows --cc=msvc --compiler-cache=clcache --without-python3 --make-tool=jom --cpu=%PLATFORM% %TARGET% + - python src\scripts\ci_build.py --os=windows --cc=msvc --without-python3 --make-tool=jom --cpu=%PLATFORM% %TARGET% # whitelist branches to avoid testing feature branches twice (as branch and as pull request) branches: only: - master - release-2 - -# Despite claim in docs, %HOME% not supported -cache: - - C:\Users\Appveyor\clcache -> src\scripts\ci\appveyor.yml diff --git a/src/scripts/ci/setup_appveyor.bat b/src/scripts/ci/setup_appveyor.bat index d8d3bff77..e3f081773 100644 --- a/src/scripts/ci/setup_appveyor.bat +++ b/src/scripts/ci/setup_appveyor.bat @@ -10,10 +10,3 @@ cl appveyor DownloadFile http://download.qt.io/official_releases/jom/jom.zip -FileName jom.zip 7z e jom.zip - -nuget install -ExcludeVersion -Version 4.1.0 clcache - -set PATH=%PATH%;clcache\clcache-4.1.0 - -rem We rely on LZMA compression to stay under appveyors cache limit -clcache -M 536870912 |