From 6c7cdb981de51405f389e4b0df1b03fc5ec13226 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 0f378099f2..a76c4622de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -570,7 +570,7 @@ macOS13_Xcode14_arm64: - Get-Volume - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log cache: - key: ninja-v6 + key: ninja-v7 paths: - ccache - deps @@ -679,7 +679,7 @@ macOS13_Xcode14_arm64: - Get-Volume - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log cache: - key: msbuild-v6 + key: msbuild-v7 paths: - ccache - deps diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh index 5b79f4304d..9f11777c7c 100644 --- a/CI/before_script.msvc.sh +++ b/CI/before_script.msvc.sh @@ -562,7 +562,7 @@ OPENAL_VER="1.23.0" QT_VER="5.15.2" 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"