diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 76ae281bcd..34ca39f365 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -606,7 +606,7 @@ macOS14_Xcode15_arm64: - Get-Volume - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log cache: - key: ninja-2022-v9 + key: ninja-2022-v10 paths: - ccache - deps @@ -716,7 +716,7 @@ macOS14_Xcode15_arm64: - Get-Volume - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log cache: - key: msbuild-2022-v9 + key: msbuild-2022-v10 paths: - deps - MSVC2022_64/deps/Qt diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh index 6b58dbe1c3..48beea390b 100644 --- a/CI/before_script.msvc.sh +++ b/CI/before_script.msvc.sh @@ -573,7 +573,7 @@ ICU_VER="70_1" LUAJIT_VER="v2.1.0-beta3-452-g7a0cf5fd" LZ4_VER="1.9.2" OPENAL_VER="1.23.0" -QT_VER="6.6.2" +QT_VER="6.6.3" OSG_ARCHIVE_NAME="OSGoS 3.6.5" OSG_ARCHIVE="OSGoS-3.6.5-123-g68c5c573d-msvc${OSG_MSVC_YEAR}-win${BITS}" @@ -904,7 +904,7 @@ printf "Qt ${QT_VER}... " printf "Exists. " elif [ -z $SKIP_EXTRACT ]; then pushd "$DEPS" > /dev/null - AQT_VERSION="v3.1.12" + AQT_VERSION="v3.1.15" if ! [ -f "aqt_x64-${AQT_VERSION}.exe" ]; then download "aqt ${AQT_VERSION}"\ "https://github.com/miurahr/aqtinstall/releases/download/${AQT_VERSION}/aqt_x64.exe" \