From 1865d70ef892d3a06e7aef4f0861e28f0812dc2d Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 15 Nov 2021 17:30:58 +0200 Subject: [PATCH] Provisioning: Start using latest macOS 11 version 11.6 New tier 1 image's name format is qtci-macos-11-x86_64 Pick-to: 6.2 Pick-to: 6.3 Pick-to: 5.15 Change-Id: Ieb23b64a0981bdd282d2ae482dd5ccda3f7ecaed Reviewed-by: Ville-Pekka Karhu --- coin/platform_configs/cmake_platforms.yaml | 2 +- coin/platform_configs/cmake_platforms_static_tests.yaml | 2 +- coin/platform_configs/macos-developer-build-tests.yaml | 2 +- coin/platform_configs/macos.yaml | 2 +- .../01-disable-net-lso.sh | 0 .../01-disable-notifications_and_warnings.sh | 0 .../01-increase_limits.sh | 0 .../01-install_telegraf.sh | 0 .../01-sha1sum-compatibility.sh | 0 .../03-bashprofile.sh | 0 .../05-systemsetup.sh | 0 .../06-crashreporter.sh | 0 .../06-disable_spotlight.sh | 0 .../06-disable_update_downloads.sh | 0 .../07-SSL_keychain.sh | 0 .../{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/15-xz.sh | 0 .../{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/20-java.sh | 0 .../20-xcode.sh | 0 .../21-install-commandlinetools.sh | 0 .../24-sccache.sh | 0 .../25-cmake.sh | 0 .../25-homebrew.sh | 0 .../25-mysql.sh | 0 .../{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/25-pip.sh | 0 .../25-postgresql.sh | 0 .../25-python2.sh | 0 .../25-python3.sh | 0 .../26-freetype.sh | 0 .../26-ninja.sh | 0 .../{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/26-odbc.sh | 0 .../26-p7zip.sh | 0 .../26-pcre2.sh | 0 .../27-libclang.sh | 0 .../28-libclang-v100-dyn.sh | 0 .../29-libusb.sh | 0 .../30-android.sh | 0 .../{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/30-fbx.sh | 0 .../30-install-conan.sh | 0 .../30-nodejs.sh | 0 .../35-install-breakpad.sh | 0 .../35-install_protobuff.sh | 0 .../35-openssl.sh | 0 .../36-emsdk.sh | 0 .../80-screenresolution.sh | 0 .../90-squish.sh | 0 .../97-set-locale.sh | 0 .../99-mac-version.sh | 0 47 files changed, 4 insertions(+), 4 deletions(-) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/01-disable-net-lso.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/01-disable-notifications_and_warnings.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/01-increase_limits.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/01-install_telegraf.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/01-sha1sum-compatibility.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/03-bashprofile.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/05-systemsetup.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/06-crashreporter.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/06-disable_spotlight.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/06-disable_update_downloads.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/07-SSL_keychain.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/15-xz.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/20-java.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/20-xcode.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/21-install-commandlinetools.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/24-sccache.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/25-cmake.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/25-homebrew.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/25-mysql.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/25-pip.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/25-postgresql.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/25-python2.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/25-python3.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/26-freetype.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/26-ninja.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/26-odbc.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/26-p7zip.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/26-pcre2.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/27-libclang.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/28-libclang-v100-dyn.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/29-libusb.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/30-android.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/30-fbx.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/30-install-conan.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/30-nodejs.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/35-install-breakpad.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/35-install_protobuff.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/35-openssl.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/36-emsdk.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/80-screenresolution.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/90-squish.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/97-set-locale.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/99-mac-version.sh (100%) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 1bd63658..893cb36a 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -157,7 +157,7 @@ Configurations: Environment variables: [ 'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc'] - - Template: 'qtci-macos-11.0-x86_64-102' + Template: 'qtci-macos-11-x86_64-104' Target os: 'IOS_ANY' Target arch: 'arm64' Compiler: 'Clang' diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index dd37ed34..fc0c5a9f 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -14,7 +14,7 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}' ] - - Template: 'qtci-macos-11.0-x86_64-102' + Template: 'qtci-macos-11-x86_64-104' Compiler: 'Clang' Features: ['Sccache', 'MinimalStaticTests'] Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=OFF -DFEATURE_framework=OFF' diff --git a/coin/platform_configs/macos-developer-build-tests.yaml b/coin/platform_configs/macos-developer-build-tests.yaml index ee16d6fd..94e85246 100644 --- a/coin/platform_configs/macos-developer-build-tests.yaml +++ b/coin/platform_configs/macos-developer-build-tests.yaml @@ -18,7 +18,7 @@ Configurations: Platform dependency: 'macos-latest-xcode-x86_64-developer-build' - Id: 'macos-11-x86_64-developer-build-tests' - Template: 'qtci-macos-11.0-x86_64-102' + Template: 'qtci-macos-11-x86_64-104' Compiler: 'Clang' Features: ['Sccache', 'TestOnly'] Platform dependency: 'macos-latest-xcode-x86_64-developer-build' diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 0d08bdc2..0638daca 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -35,7 +35,7 @@ Configurations: Platform dependency: 'macos-latest-xcode-universal-packaging-build' - Id: 'macos-11-x86_64-tests' - Template: 'qtci-macos-11.0-x86_64-102' + Template: 'qtci-macos-11-x86_64-104' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'Packaging'] Platform dependency: 'macos-latest-xcode-universal-packaging-build' diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/01-disable-net-lso.sh b/coin/provisioning/qtci-macos-11-x86_64/01-disable-net-lso.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/01-disable-net-lso.sh rename to coin/provisioning/qtci-macos-11-x86_64/01-disable-net-lso.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/01-disable-notifications_and_warnings.sh b/coin/provisioning/qtci-macos-11-x86_64/01-disable-notifications_and_warnings.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/01-disable-notifications_and_warnings.sh rename to coin/provisioning/qtci-macos-11-x86_64/01-disable-notifications_and_warnings.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-11-x86_64/01-increase_limits.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/01-increase_limits.sh rename to coin/provisioning/qtci-macos-11-x86_64/01-increase_limits.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-macos-11-x86_64/01-install_telegraf.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/01-install_telegraf.sh rename to coin/provisioning/qtci-macos-11-x86_64/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-macos-11-x86_64/01-sha1sum-compatibility.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/01-sha1sum-compatibility.sh rename to coin/provisioning/qtci-macos-11-x86_64/01-sha1sum-compatibility.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/03-bashprofile.sh b/coin/provisioning/qtci-macos-11-x86_64/03-bashprofile.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/03-bashprofile.sh rename to coin/provisioning/qtci-macos-11-x86_64/03-bashprofile.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-11-x86_64/05-systemsetup.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/05-systemsetup.sh rename to coin/provisioning/qtci-macos-11-x86_64/05-systemsetup.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/06-crashreporter.sh b/coin/provisioning/qtci-macos-11-x86_64/06-crashreporter.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/06-crashreporter.sh rename to coin/provisioning/qtci-macos-11-x86_64/06-crashreporter.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/06-disable_spotlight.sh b/coin/provisioning/qtci-macos-11-x86_64/06-disable_spotlight.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/06-disable_spotlight.sh rename to coin/provisioning/qtci-macos-11-x86_64/06-disable_spotlight.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/06-disable_update_downloads.sh b/coin/provisioning/qtci-macos-11-x86_64/06-disable_update_downloads.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/06-disable_update_downloads.sh rename to coin/provisioning/qtci-macos-11-x86_64/06-disable_update_downloads.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/07-SSL_keychain.sh b/coin/provisioning/qtci-macos-11-x86_64/07-SSL_keychain.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/07-SSL_keychain.sh rename to coin/provisioning/qtci-macos-11-x86_64/07-SSL_keychain.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-11-x86_64/15-xz.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/15-xz.sh rename to coin/provisioning/qtci-macos-11-x86_64/15-xz.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/20-java.sh b/coin/provisioning/qtci-macos-11-x86_64/20-java.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/20-java.sh rename to coin/provisioning/qtci-macos-11-x86_64/20-java.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-11-x86_64/20-xcode.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/20-xcode.sh rename to coin/provisioning/qtci-macos-11-x86_64/20-xcode.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-11-x86_64/21-install-commandlinetools.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/21-install-commandlinetools.sh rename to coin/provisioning/qtci-macos-11-x86_64/21-install-commandlinetools.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/24-sccache.sh b/coin/provisioning/qtci-macos-11-x86_64/24-sccache.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/24-sccache.sh rename to coin/provisioning/qtci-macos-11-x86_64/24-sccache.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-11-x86_64/25-cmake.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/25-cmake.sh rename to coin/provisioning/qtci-macos-11-x86_64/25-cmake.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-11-x86_64/25-homebrew.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/25-homebrew.sh rename to coin/provisioning/qtci-macos-11-x86_64/25-homebrew.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/25-mysql.sh b/coin/provisioning/qtci-macos-11-x86_64/25-mysql.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/25-mysql.sh rename to coin/provisioning/qtci-macos-11-x86_64/25-mysql.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/25-pip.sh b/coin/provisioning/qtci-macos-11-x86_64/25-pip.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/25-pip.sh rename to coin/provisioning/qtci-macos-11-x86_64/25-pip.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/25-postgresql.sh b/coin/provisioning/qtci-macos-11-x86_64/25-postgresql.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/25-postgresql.sh rename to coin/provisioning/qtci-macos-11-x86_64/25-postgresql.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/25-python2.sh b/coin/provisioning/qtci-macos-11-x86_64/25-python2.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/25-python2.sh rename to coin/provisioning/qtci-macos-11-x86_64/25-python2.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/25-python3.sh b/coin/provisioning/qtci-macos-11-x86_64/25-python3.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/25-python3.sh rename to coin/provisioning/qtci-macos-11-x86_64/25-python3.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/26-freetype.sh b/coin/provisioning/qtci-macos-11-x86_64/26-freetype.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/26-freetype.sh rename to coin/provisioning/qtci-macos-11-x86_64/26-freetype.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/26-ninja.sh b/coin/provisioning/qtci-macos-11-x86_64/26-ninja.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/26-ninja.sh rename to coin/provisioning/qtci-macos-11-x86_64/26-ninja.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/26-odbc.sh b/coin/provisioning/qtci-macos-11-x86_64/26-odbc.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/26-odbc.sh rename to coin/provisioning/qtci-macos-11-x86_64/26-odbc.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/26-p7zip.sh b/coin/provisioning/qtci-macos-11-x86_64/26-p7zip.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/26-p7zip.sh rename to coin/provisioning/qtci-macos-11-x86_64/26-p7zip.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/26-pcre2.sh b/coin/provisioning/qtci-macos-11-x86_64/26-pcre2.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/26-pcre2.sh rename to coin/provisioning/qtci-macos-11-x86_64/26-pcre2.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/27-libclang.sh b/coin/provisioning/qtci-macos-11-x86_64/27-libclang.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/27-libclang.sh rename to coin/provisioning/qtci-macos-11-x86_64/27-libclang.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/28-libclang-v100-dyn.sh b/coin/provisioning/qtci-macos-11-x86_64/28-libclang-v100-dyn.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/28-libclang-v100-dyn.sh rename to coin/provisioning/qtci-macos-11-x86_64/28-libclang-v100-dyn.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/29-libusb.sh b/coin/provisioning/qtci-macos-11-x86_64/29-libusb.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/29-libusb.sh rename to coin/provisioning/qtci-macos-11-x86_64/29-libusb.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/30-android.sh b/coin/provisioning/qtci-macos-11-x86_64/30-android.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/30-android.sh rename to coin/provisioning/qtci-macos-11-x86_64/30-android.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/30-fbx.sh b/coin/provisioning/qtci-macos-11-x86_64/30-fbx.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/30-fbx.sh rename to coin/provisioning/qtci-macos-11-x86_64/30-fbx.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/30-install-conan.sh b/coin/provisioning/qtci-macos-11-x86_64/30-install-conan.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/30-install-conan.sh rename to coin/provisioning/qtci-macos-11-x86_64/30-install-conan.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/30-nodejs.sh b/coin/provisioning/qtci-macos-11-x86_64/30-nodejs.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/30-nodejs.sh rename to coin/provisioning/qtci-macos-11-x86_64/30-nodejs.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-macos-11-x86_64/35-install-breakpad.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/35-install-breakpad.sh rename to coin/provisioning/qtci-macos-11-x86_64/35-install-breakpad.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/35-install_protobuff.sh b/coin/provisioning/qtci-macos-11-x86_64/35-install_protobuff.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/35-install_protobuff.sh rename to coin/provisioning/qtci-macos-11-x86_64/35-install_protobuff.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-11-x86_64/35-openssl.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/35-openssl.sh rename to coin/provisioning/qtci-macos-11-x86_64/35-openssl.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/36-emsdk.sh b/coin/provisioning/qtci-macos-11-x86_64/36-emsdk.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/36-emsdk.sh rename to coin/provisioning/qtci-macos-11-x86_64/36-emsdk.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/80-screenresolution.sh b/coin/provisioning/qtci-macos-11-x86_64/80-screenresolution.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/80-screenresolution.sh rename to coin/provisioning/qtci-macos-11-x86_64/80-screenresolution.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/90-squish.sh b/coin/provisioning/qtci-macos-11-x86_64/90-squish.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/90-squish.sh rename to coin/provisioning/qtci-macos-11-x86_64/90-squish.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/97-set-locale.sh b/coin/provisioning/qtci-macos-11-x86_64/97-set-locale.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/97-set-locale.sh rename to coin/provisioning/qtci-macos-11-x86_64/97-set-locale.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/99-mac-version.sh b/coin/provisioning/qtci-macos-11-x86_64/99-mac-version.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/99-mac-version.sh rename to coin/provisioning/qtci-macos-11-x86_64/99-mac-version.sh