mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2026-01-31 11:48:26 +00:00
Code Issues Releases Wiki Activity

switch back to ccache now that msvc support has landed; let it pass through until new release

Browse source
This commit is contained in:
Bret Curtis 2022-01-05 13:13:18 +01:00 committed by Bret Curtis
parent f197235ec3
commit dac18ef3cc
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.gitlab-ci.yml
View file

@ -352,7 +352,7 @@ variables: &tests-targets
- choco source add -n=openmw-proxy -s="https://repo.openmw.org/repository/Chocolatey/" --priority=1
- choco install git --force --params "/GitAndUnixToolsOnPath" -y
- choco install 7zip -y
- choco install sccache -y
- choco install ccache -y
- choco install cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' -y
- choco install vswhere -y
- choco install ninja -y
@ -375,11 +375,10 @@ variables: &tests-targets
- $time = (Get-Date -Format "HH:mm:ss")
- echo ${time}
- echo "started by ${GITLAB_USER_NAME}"
- $env:SCCACHE_BASEDIR = Get-Location
- $env:SCCACHE_DIR = "$(Get-Location)\sccache"
- New-Item -Type Directory -Force -Path $env:SCCACHE_DIR
- sccache --show-stats
# - sccache --start-server
- $env:CCACHE_BASEDIR = Get-Location
- $env:CCACHE_DIR = "$(Get-Location)\ccache"
- New-Item -Type Directory -Force -Path $env:CCACHE_DIR
- ccache --show-stats
- sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -N -b -t -C
- cd MSVC2019_64_Ninja
- .\ActivateMSVC.ps1
@ -394,13 +393,13 @@ variables: &tests-targets
}
- 7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${package}_${config}_${CI_COMMIT_REF_NAME}.zip"))" '*'
- if ($executables) { foreach ($exe in $executables.Split(',')) { & .\$exe } }
- sccache --show-stats
- ccache --show-stats
after_script:
- Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
cache:
key: ninja-v2
paths:
- sccache
- ccache
- deps
- MSVC2019_64_Ninja/deps/Qt
variables:

4
CI/before_script.msvc.sh
View file

@ -149,7 +149,7 @@ Options:
For mutli-config generators, this is ignored, and all configurations are set up.
For single-config generators, several configurations can be set up at once by specifying -c multiple times.
-C
Use sccache.
Use ccache.
-d
Skip checking the downloads.
-e
@ -509,7 +509,7 @@ if ! [ -z $UNITY_BUILD ]; then
fi
if ! [ -z $USE_SCCACHE ]; then
add_cmake_opts "-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
add_cmake_opts "-DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
fi
echo