From f568909022f7d6be8c2bd80fc78ab972086d7a6e Mon Sep 17 00:00:00 2001 From: elsid Date: Sat, 10 Jun 2023 00:25:15 +0200 Subject: [PATCH] Use most recent OSG dependency to match 0.48 RC builds --- .gitlab-ci.yml | 4 ++-- CI/before_script.msvc.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3340c2f51d..ec5c934e91 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -440,7 +440,7 @@ macOS12_Xcode13: after_script: - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log cache: - key: ninja-v4 + key: ninja-v0.48.5 paths: - ccache - deps @@ -541,7 +541,7 @@ macOS12_Xcode13: after_script: - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log cache: - key: msbuild-v4 + key: msbuild-v0.48.5 paths: - ccache - deps diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh index 2c08284c55..9e0e9ccc33 100644 --- a/CI/before_script.msvc.sh +++ b/CI/before_script.msvc.sh @@ -556,7 +556,7 @@ fi ICU_VER="70_1" OSG_ARCHIVE_NAME="OSGoS 3.6.5" -OSG_ARCHIVE="OSGoS-3.6.5-dd803bc-msvc${OSG_MSVC_YEAR}-win${BITS}" +OSG_ARCHIVE="OSGoS-3.6.5-123-g68c5c573d-msvc${OSG_MSVC_YEAR}-win${BITS}" OSG_ARCHIVE_REPO_URL="https://gitlab.com/OpenMW/openmw-deps/-/raw/main" if ! [ -z $OSG_MULTIVIEW_BUILD ]; then OSG_ARCHIVE_NAME="OSG-3.6-multiview"