From 33fe37a660358c1a565456802e9b2187bda05e4f Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 30 Nov 2022 11:30:04 -0500 Subject: gitlab-ci: replace '{macos,windows}' tags with '{macos,windows}-x86_64' The latter tags are now available on our CI runners to more explicitly distinguish `{macos,windows}-x86_64` from `{macos,windows}-arm64`. --- .gitlab/os-macos.yml | 6 +++--- .gitlab/os-windows.yml | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index 1969ad8..258fa31 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -93,7 +93,7 @@ .macos_x86_64_tags: tags: - cmake # Since this is a bare runner, pin to a project. - - macos + - macos-x86_64 - shell - xcode-14.1 - nonconcurrent @@ -101,7 +101,7 @@ .macos_x86_64_tags_package: tags: - cmake # Since this is a bare runner, pin to a project. - - macos + - macos-x86_64 - shell - xcode-14.1 - nonconcurrent @@ -110,7 +110,7 @@ .macos_x86_64_tags_ext: tags: - cmake # Since this is a bare runner, pin to a project. - - macos + - macos-x86_64 - shell - xcode-14.1 - concurrent diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index f1a1520..22d731a 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -276,7 +276,7 @@ .windows_x86_64_tags_nonconcurrent_vs2022: tags: - cmake # Since this is a bare runner, pin to a project. - - windows + - windows-x86_64 - shell - vs2022 - msvc-19.34 @@ -285,7 +285,7 @@ .windows_x86_64_tags_nonconcurrent_vs2022_arm64: tags: - cmake # Since this is a bare runner, pin to a project. - - windows + - windows-x86_64 - shell - vs2022 - msvc-19.34-arm64 @@ -294,7 +294,7 @@ .windows_x86_64_tags_concurrent_vs2022: tags: - cmake # Since this is a bare runner, pin to a project. - - windows + - windows-x86_64 - shell - vs2022 - msvc-19.34 @@ -303,7 +303,7 @@ .windows_x86_64_tags_concurrent_vs2019: tags: - cmake # Since this is a bare runner, pin to a project. - - windows + - windows-x86_64 - shell - vs2019 - msvc-19.29-16.11 @@ -312,7 +312,7 @@ .windows_x86_64_tags_concurrent: tags: - cmake # Since this is a bare runner, pin to a project. - - windows + - windows-x86_64 - shell - concurrent -- cgit v0.12