diff options
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/os-macos.yml | 12 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 22 |
2 files changed, 17 insertions, 17 deletions
diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index 1579338a76..09d7598492 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -7,7 +7,7 @@ GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci ext/$CI_CONCURRENT_ID" # TODO: Factor this out so that each job selects the Xcode version to # use so that different versions can be tested in a single pipeline. - DEVELOPER_DIR: "/Applications/Xcode-14.2.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-14.3.app/Contents/Developer" # Avoid conflicting with other projects running on the same machine. SCCACHE_SERVER_PORT: 4227 @@ -110,7 +110,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-x86_64 - shell - - xcode-14.2 + - xcode-14.3 - nonconcurrent .macos_x86_64_tags_ext: @@ -118,7 +118,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-x86_64 - shell - - xcode-14.2 + - xcode-14.3 - concurrent .macos_arm64_tags: @@ -126,7 +126,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-14.2 + - xcode-14.3 - nonconcurrent .macos_arm64_tags_ext: @@ -134,7 +134,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-14.2 + - xcode-14.3 - concurrent .macos_arm64_tags_package: @@ -142,7 +142,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-14.2 + - xcode-14.3 - nonconcurrent - finder diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 07a479e045..026f2f4422 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -35,25 +35,25 @@ variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64" - VCVARSVERSION: "14.35.32215" + VCVARSVERSION: "14.36.32532" .windows_vcvarsall_vs2022_x86: variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x86" - VCVARSVERSION: "14.35.32215" + VCVARSVERSION: "14.36.32532" .windows_vcvarsall_vs2022_x64_arm64: variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64_arm64" - VCVARSVERSION: "14.35.32215" + VCVARSVERSION: "14.36.32532" .windows_arm64_vcvarsall_vs2022: variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "arm64" - VCVARSVERSION: "14.35.32215" + VCVARSVERSION: "14.36.32532" .windows_vs2022_x64_ninja: extends: @@ -112,7 +112,7 @@ CMAKE_CONFIGURATION: windows_vs2022_x64 CMAKE_GENERATOR: "Visual Studio 17 2022" CMAKE_GENERATOR_PLATFORM: "x64" - CMAKE_GENERATOR_TOOLSET: "v143,version=14.35.32215" + CMAKE_GENERATOR_TOOLSET: "v143,version=14.36.32532" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" .windows_vs2019_x64: @@ -261,7 +261,7 @@ CMAKE_CONFIGURATION: windows_arm64_vs2022 CMAKE_GENERATOR: "Visual Studio 17 2022" CMAKE_GENERATOR_PLATFORM: "ARM64" - CMAKE_GENERATOR_TOOLSET: "v143,version=14.35.32215" + CMAKE_GENERATOR_TOOLSET: "v143,version=14.36.32532" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" .mingw_osdn_io: @@ -295,7 +295,7 @@ - windows-x86_64 - shell - vs2022 - - msvc-19.35 + - msvc-19.36 - nonconcurrent .windows_x86_64_tags_nonconcurrent_vs2022_arm64: @@ -304,7 +304,7 @@ - windows-x86_64 - shell - vs2022 - - msvc-19.35-arm64 + - msvc-19.36-arm64 - nonconcurrent .windows_x86_64_tags_concurrent_vs2022: @@ -313,7 +313,7 @@ - windows-x86_64 - shell - vs2022 - - msvc-19.35 + - msvc-19.36 - concurrent .windows_x86_64_tags_concurrent_vs2019: @@ -338,7 +338,7 @@ - windows-arm64 - shell - vs2022 - - msvc-19.35 + - msvc-19.36 - nonconcurrent .windows_arm64_tags_concurrent_vs2022: @@ -347,7 +347,7 @@ - windows-arm64 - shell - vs2022 - - msvc-19.35 + - msvc-19.36 - concurrent ## Windows-specific scripts |