From c37b27324360f7b4b378d55c78b81f6d2c3917ae Mon Sep 17 00:00:00 2001 From: Dmitry Makarenko Date: Thu, 20 Nov 2025 08:55:06 +0300 Subject: [PATCH] Bump macos runner version --- .github/workflows/build_all_deps.yml | 24 +++++++++---------- .gitignore | 2 ++ .../build/macos/apple_clang16_arm64.profile | 9 +++++++ .../build/macos/apple_clang16_x86_64.profile | 11 +++++++++ .../macos/apple_clang16_arm64_deb.profile | 11 +++++++++ .../macos/apple_clang16_arm64_rel.profile | 11 +++++++++ .../macos/apple_clang16_x86_64_deb.profile | 13 ++++++++++ .../macos/apple_clang16_x86_64_rel.profile | 12 ++++++++++ 8 files changed, 81 insertions(+), 12 deletions(-) create mode 100644 config/profiles/build/macos/apple_clang16_arm64.profile create mode 100644 config/profiles/build/macos/apple_clang16_x86_64.profile create mode 100644 config/profiles/host/macos/apple_clang16_arm64_deb.profile create mode 100644 config/profiles/host/macos/apple_clang16_arm64_rel.profile create mode 100644 config/profiles/host/macos/apple_clang16_x86_64_deb.profile create mode 100644 config/profiles/host/macos/apple_clang16_x86_64_rel.profile diff --git a/.github/workflows/build_all_deps.yml b/.github/workflows/build_all_deps.yml index 21a9bec..a30054f 100644 --- a/.github/workflows/build_all_deps.yml +++ b/.github/workflows/build_all_deps.yml @@ -193,16 +193,16 @@ jobs: fail-fast: false matrix: config: - - name: XCode 14.2 - os: macos-13 - compiler: 14 - xcode_version: 14.2 + - name: XCode 16.2 + os: macos-14 + compiler: 16 + xcode_version: 16.2 release_args: --enable-debug-processor sentry --skip-debug-data-upload metadata: "platform: darwin" - - name: XCode 15.0.1 - os: macos-13 + - name: XCode 15.4 + os: macos-14 compiler: 15 - xcode_version: 15.0.1 + xcode_version: 15.4 release_args: metadata: | upload_build_tools: true @@ -238,10 +238,10 @@ jobs: shell: bash run: | python3 utils/conan-utils.py export-recipes --build-order ${{ github.event.inputs.build_order }} - python3 utils/conan-utils.py validate-recipe --remote conan-utils-audacity-binaries-conan2 --profile-host host/macos/apple_clang${{ matrix.config.compiler }}_x86_64_rel --profile-build build/macos/apple_clang${{ matrix.config.compiler }}_x86_64 --build-order ${{ github.event.inputs.build_order }} --recipe-config ${{ github.event.inputs.build_config }} --recipe audacity/conan/conanfile.py ${{ matrix.config.release_args }} - python3 utils/conan-utils.py validate-recipe --remote conan-utils-audacity-binaries-conan2 --profile-host host/macos/apple_clang${{ matrix.config.compiler }}_arm64_rel --profile-build build/macos/apple_clang${{ matrix.config.compiler }}_x86_64 --build-order ${{ github.event.inputs.build_order }} --recipe-config ${{ github.event.inputs.build_config }} --recipe audacity/conan/conanfile.py ${{ matrix.config.release_args }} - python3 utils/conan-utils.py validate-recipe --remote conan-utils-audacity-binaries-conan2 --profile-host host/macos/apple_clang${{ matrix.config.compiler }}_x86_64_deb --profile-build build/macos/apple_clang${{ matrix.config.compiler }}_x86_64 --build-order ${{ github.event.inputs.build_order }} --recipe-config ${{ github.event.inputs.build_config }} --recipe audacity/conan/conanfile.py - python3 utils/conan-utils.py validate-recipe --remote conan-utils-audacity-binaries-conan2 --profile-host host/macos/apple_clang${{ matrix.config.compiler }}_arm64_deb --profile-build build/macos/apple_clang${{ matrix.config.compiler }}_x86_64 --build-order ${{ github.event.inputs.build_order }} --recipe-config ${{ github.event.inputs.build_config }} --recipe audacity/conan/conanfile.py + python3 utils/conan-utils.py validate-recipe --remote conan-utils-audacity-binaries-conan2 --profile-host host/macos/apple_clang${{ matrix.config.compiler }}_x86_64_rel --profile-build build/macos/apple_clang${{ matrix.config.compiler }}_arm64 --build-order ${{ github.event.inputs.build_order }} --recipe-config ${{ github.event.inputs.build_config }} --recipe audacity/conan/conanfile.py ${{ matrix.config.release_args }} + python3 utils/conan-utils.py validate-recipe --remote conan-utils-audacity-binaries-conan2 --profile-host host/macos/apple_clang${{ matrix.config.compiler }}_arm64_rel --profile-build build/macos/apple_clang${{ matrix.config.compiler }}_arm64 --build-order ${{ github.event.inputs.build_order }} --recipe-config ${{ github.event.inputs.build_config }} --recipe audacity/conan/conanfile.py ${{ matrix.config.release_args }} + python3 utils/conan-utils.py validate-recipe --remote conan-utils-audacity-binaries-conan2 --profile-host host/macos/apple_clang${{ matrix.config.compiler }}_x86_64_deb --profile-build build/macos/apple_clang${{ matrix.config.compiler }}_arm64 --build-order ${{ github.event.inputs.build_order }} --recipe-config ${{ github.event.inputs.build_config }} --recipe audacity/conan/conanfile.py + python3 utils/conan-utils.py validate-recipe --remote conan-utils-audacity-binaries-conan2 --profile-host host/macos/apple_clang${{ matrix.config.compiler }}_arm64_deb --profile-build build/macos/apple_clang${{ matrix.config.compiler }}_arm64 --build-order ${{ github.event.inputs.build_order }} --recipe-config ${{ github.event.inputs.build_config }} --recipe audacity/conan/conanfile.py - name: Upload to Cache shell: bash run: | @@ -283,7 +283,7 @@ jobs: - name: Windows os: windows-2022 - name: MacOS - os: macos-13 + os: macos-14 needs: [update_conan_remotes] steps: - name: Checkout Repo diff --git a/.gitignore b/.gitignore index 8dafeb7..4607849 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ autom4te.cache/ recipes/qt-tools/all/src/ recipes/qt/6.x.x/src/ + +*.log diff --git a/config/profiles/build/macos/apple_clang16_arm64.profile b/config/profiles/build/macos/apple_clang16_arm64.profile new file mode 100644 index 0000000..a03c257 --- /dev/null +++ b/config/profiles/build/macos/apple_clang16_arm64.profile @@ -0,0 +1,9 @@ +[settings] +os = Macos +os.version=11.0 +arch = armv8 +compiler = apple-clang +compiler.version = 16 +compiler.libcxx = libc++ +compiler.cppstd = 17 +build_type = Release diff --git a/config/profiles/build/macos/apple_clang16_x86_64.profile b/config/profiles/build/macos/apple_clang16_x86_64.profile new file mode 100644 index 0000000..bb61ef5 --- /dev/null +++ b/config/profiles/build/macos/apple_clang16_x86_64.profile @@ -0,0 +1,11 @@ +[settings] +os = Macos +os.version=11.0 +arch = x86_64 +compiler = apple-clang +compiler.version = 16 +compiler.libcxx = libc++ +compiler.cppstd = 17 +build_type = Release +[options] +catch2/*:no_std_unchaught_exceptions=True diff --git a/config/profiles/host/macos/apple_clang16_arm64_deb.profile b/config/profiles/host/macos/apple_clang16_arm64_deb.profile new file mode 100644 index 0000000..d331747 --- /dev/null +++ b/config/profiles/host/macos/apple_clang16_arm64_deb.profile @@ -0,0 +1,11 @@ +[settings] +os = Macos +os.version=10.13 +arch = armv8 +compiler = apple-clang +compiler.version = 16 +compiler.libcxx = libc++ +compiler.cppstd = 17 +build_type = Debug +[options] +*:shared=True diff --git a/config/profiles/host/macos/apple_clang16_arm64_rel.profile b/config/profiles/host/macos/apple_clang16_arm64_rel.profile new file mode 100644 index 0000000..3b0aee5 --- /dev/null +++ b/config/profiles/host/macos/apple_clang16_arm64_rel.profile @@ -0,0 +1,11 @@ +[settings] +os = Macos +os.version=10.13 +arch = armv8 +compiler = apple-clang +compiler.version = 16 +compiler.libcxx = libc++ +compiler.cppstd = 17 +build_type = RelWithDebInfo +[options] +*:shared=True diff --git a/config/profiles/host/macos/apple_clang16_x86_64_deb.profile b/config/profiles/host/macos/apple_clang16_x86_64_deb.profile new file mode 100644 index 0000000..c5115b2 --- /dev/null +++ b/config/profiles/host/macos/apple_clang16_x86_64_deb.profile @@ -0,0 +1,13 @@ +[settings] +os = Macos +os.version=10.13 +arch = x86_64 +compiler = apple-clang +compiler.version = 16 +compiler.libcxx = libc++ +compiler.cppstd = 17 +build_type = Debug +[options] +*:shared=True +catch2/*:no_std_unchaught_exceptions=True + diff --git a/config/profiles/host/macos/apple_clang16_x86_64_rel.profile b/config/profiles/host/macos/apple_clang16_x86_64_rel.profile new file mode 100644 index 0000000..10364bb --- /dev/null +++ b/config/profiles/host/macos/apple_clang16_x86_64_rel.profile @@ -0,0 +1,12 @@ +[settings] +os = Macos +os.version=10.13 +arch = x86_64 +compiler = apple-clang +compiler.version = 16 +compiler.libcxx = libc++ +compiler.cppstd = 17 +build_type = RelWithDebInfo +[options] +*:shared=True +catch2/*:no_std_unchaught_exceptions=True