From fb1c4dc786b28fe70225aac8f3527725393b7769 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Mon, 17 Jun 2024 14:52:41 +0100 Subject: [PATCH 1/5] Add manual-trigger job to initialise Windows dependency cache. --- .gitlab-ci.yml | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 34ca39f365..373409690c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 From 11b25e20feeb860569dc5cbbfdbd154f21ffd686 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Mon, 17 Jun 2024 14:54:22 +0100 Subject: [PATCH 2/5] Don't hide the jobs - they're already on a manual trigger --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 373409690c..4c539e7053 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -650,7 +650,7 @@ 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: +Windows_Ninja_CacheInit: # currently, Windows jobs for all configs share the same cache key as we only cache the dependencies extends: - .Windows_Ninja_Base @@ -767,7 +767,7 @@ 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: +Windows_MSBuild_CacheInit: # currently, Windows jobs for all configs share the same cache key as we only cache the dependencies extends: - .Windows_MSBuild_Base From 9d378ded0ce67bd33ada6f4eaf08684d5ad8c9c7 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Mon, 17 Jun 2024 15:13:56 +0100 Subject: [PATCH 3/5] Hide Ninja cache init job after all as we're not running Ninja jobs. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c539e7053..fbb9430dca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -650,7 +650,7 @@ 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: +.Windows_Ninja_CacheInit: # currently, Windows jobs for all configs share the same cache key as we only cache the dependencies extends: - .Windows_Ninja_Base From 8efc399859dd9288e9914260795aee3c9f512e81 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Mon, 17 Jun 2024 21:39:11 +0100 Subject: [PATCH 4/5] Switch to GitLab-hosted Lua archvies lua.org has been down all day, so CI has been dead. --- docs/source/install_luadocumentor_in_docker.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/install_luadocumentor_in_docker.sh b/docs/source/install_luadocumentor_in_docker.sh index fd7fcdb0e6..4c2eca7265 100755 --- a/docs/source/install_luadocumentor_in_docker.sh +++ b/docs/source/install_luadocumentor_in_docker.sh @@ -7,7 +7,7 @@ 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 tar -zxf lua-5.1.5.tar.gz rm lua-5.1.5.tar.gz cd lua-5.1.5/ @@ -17,7 +17,7 @@ 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 tar zxpf luarocks-$luarocksV.tar.gz rm luarocks-$luarocksV.tar.gz cd luarocks-$luarocksV/ From 1d8c50f0892b6fa3b074ab3e8050193c8c13d5cf Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Mon, 17 Jun 2024 22:32:18 +0100 Subject: [PATCH 5/5] Check checksums --- docs/source/install_luadocumentor_in_docker.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/source/install_luadocumentor_in_docker.sh b/docs/source/install_luadocumentor_in_docker.sh index 4c2eca7265..5d37a37351 100755 --- a/docs/source/install_luadocumentor_in_docker.sh +++ b/docs/source/install_luadocumentor_in_docker.sh @@ -8,6 +8,7 @@ fi echo "Install lua 5.1" cd ~ 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/ @@ -18,6 +19,7 @@ PATH=$PATH:~/lua-5.1.5/src echo "Install luarocks" luarocksV="3.9.2" 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/