1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-30 18:45:38 +00:00

Merge branch 'quick-cache-with-no-strings-attached' into 'master'

Fix CI

Closes #8031

See merge request OpenMW/openmw!4183
This commit is contained in:
AnyOldName3 2024-06-17 23:42:43 +00:00
commit 02bcd17b58
2 changed files with 28 additions and 4 deletions

View file

@ -575,7 +575,7 @@ macOS14_Xcode15_arm64:
- Get-Volume
- cd MSVC2022_64_Ninja
- .\ActivateMSVC.ps1
- cmake --build . --config $config
- cmake --build . --config $config --target $targets
- ccache --show-stats -v
- cd $config
- echo "CI_COMMIT_REF_NAME ${CI_COMMIT_REF_NAME}`nCI_JOB_ID ${CI_JOB_ID}`nCI_COMMIT_SHA ${CI_COMMIT_SHA}" | Out-File -Encoding UTF8 CI-ID.txt
@ -618,6 +618,8 @@ macOS14_Xcode15_arm64:
- "*.log"
- MSVC2022_64_Ninja/*.log
- MSVC2022_64_Ninja/**/*.log
variables:
targets: all
# When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks.
timeout: 2h
@ -648,6 +650,15 @@ macOS14_Xcode15_arm64:
# Gitlab can't successfully execute following binaries due to unknown reason
# executables: "components-tests.exe,openmw-tests.exe,openmw-cs-tests.exe,openmw_detournavigator_navmeshtilescache_benchmark.exe"
.Windows_Ninja_CacheInit:
# currently, Windows jobs for all configs share the same cache key as we only cache the dependencies
extends:
- .Windows_Ninja_Base
variables:
config: "RelWithDebInfo"
targets: "get-version"
when: manual
.Windows_MSBuild_Base:
tags:
- saas-windows-medium-amd64
@ -686,7 +697,7 @@ macOS14_Xcode15_arm64:
- sh CI/before_script.msvc.sh -c $config -p Win64 -v 2022 -k -V -b -t -C $multiview -E
- cd MSVC2022_64
- Get-Volume
- cmake --build . --config $config
- cmake --build . --config $config --target $targets
- cd $config
- echo "CI_COMMIT_REF_NAME ${CI_COMMIT_REF_NAME}`nCI_JOB_ID ${CI_JOB_ID}`nCI_COMMIT_SHA ${CI_COMMIT_SHA}" | Out-File -Encoding UTF8 CI-ID.txt
- $artifactDirectory = "$(Make-SafeFileName("${CI_PROJECT_NAMESPACE}"))/$(Make-SafeFileName("${CI_COMMIT_REF_NAME}"))/$(Make-SafeFileName("${CI_COMMIT_SHORT_SHA}-${CI_JOB_ID}"))/"
@ -727,6 +738,8 @@ macOS14_Xcode15_arm64:
- "*.log"
- MSVC2022_64/*.log
- MSVC2022_64/**/*.log
variables:
targets: ALL_BUILD
# When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks.
timeout: 2h
@ -754,6 +767,15 @@ Windows_MSBuild_RelWithDebInfo:
# run this for both pushes and schedules so 'latest successful pipeline for branch' always includes it
- if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "schedule"
Windows_MSBuild_CacheInit:
# currently, Windows jobs for all configs share the same cache key as we only cache the dependencies
extends:
- .Windows_MSBuild_Base
variables:
config: "RelWithDebInfo"
targets: "get-version"
when: manual
.Ubuntu_AndroidNDK_arm64-v8a:
tags:
- saas-linux-medium-amd64

View file

@ -7,7 +7,8 @@ fi
echo "Install lua 5.1"
cd ~
curl -R -O https://www.lua.org/ftp/lua-5.1.5.tar.gz
curl -R -O https://gitlab.com/OpenMW/openmw-deps/-/raw/main/lua/lua-5.1.5.tar.gz
echo "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333 lua-5.1.5.tar.gz" | sha256sum -c
tar -zxf lua-5.1.5.tar.gz
rm lua-5.1.5.tar.gz
cd lua-5.1.5/
@ -17,7 +18,8 @@ PATH=$PATH:~/lua-5.1.5/src
echo "Install luarocks"
luarocksV="3.9.2"
wget https://luarocks.org/releases/luarocks-$luarocksV.tar.gz
wget https://gitlab.com/OpenMW/openmw-deps/-/raw/main/lua/luarocks-$luarocksV.tar.gz
echo "bca6e4ecc02c203e070acdb5f586045d45c078896f6236eb46aa33ccd9b94edb luarocks-$luarocksV.tar.gz" | sha256sum -c
tar zxpf luarocks-$luarocksV.tar.gz
rm luarocks-$luarocksV.tar.gz
cd luarocks-$luarocksV/