From 10c2cca9ce6ec4f6b8a78a91642152aa6bbdd323 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Wed, 4 Dec 2024 09:20:06 +0000 Subject: [PATCH] HPCC-33071 GH Actions, bump macos versions macos-12 has been deprecated see: https://github.com/actions/runner-images/issues/10721 Signed-off-by: Gordon Smith --- .github/workflows/build-assets.yml | 2 +- .github/workflows/build-vcpkg.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-assets.yml b/.github/workflows/build-assets.yml index ad8e387ab29..79348cc066b 100644 --- a/.github/workflows/build-assets.yml +++ b/.github/workflows/build-assets.yml @@ -449,7 +449,7 @@ jobs: sudo: "" cmake_config_options: '-T host=x64 -A x64 -DUSE_OPTIONAL=OFF -DCLIENTTOOLS_ONLY=ON -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_PARQUET=OFF -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF' cmake_build_options: "--config Release --parallel $NUMBER_OF_PROCESSORS" - - os: "macos-12" + - os: "macos-13" mono: "mono" sudo: "sudo" cmake_config_options: "-DCMAKE_BUILD_TYPE=Release -DUSE_OPTIONAL=OFF -DCLIENTTOOLS_ONLY=ON -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_PARQUET=OFF -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF" diff --git a/.github/workflows/build-vcpkg.yml b/.github/workflows/build-vcpkg.yml index e089e2ba0a7..35c1c448393 100644 --- a/.github/workflows/build-vcpkg.yml +++ b/.github/workflows/build-vcpkg.yml @@ -214,20 +214,20 @@ jobs: cmake-configuration-ex: '-T host=x64 -A x64 -DUSE_CPPUNIT=OFF -DCLIENTTOOLS_ONLY=ON -DINCLUDE_PLUGINS=OFF -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_PARQUET=OFF -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF' secrets: inherit - build-gh_runner-macos-13: + build-gh_runner-macos-14: if: ${{ contains('pull_request,push', github.event_name) }} uses: ./.github/workflows/build-gh_runner.yml with: - os: macos-13 + os: macos-14 build-type: 'Release' cmake-configuration-ex: '-DUSE_CPPUNIT=OFF -DCLIENTTOOLS_ONLY=ON -DINCLUDE_PLUGINS=OFF -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_PARQUET=OFF -DSUPPRESS_CASSANDRAEMBED=ON -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF' secrets: inherit - build-gh_runner-macos-12: + build-gh_runner-macos-13: if: ${{ contains('schedule,push', github.event_name) }} uses: ./.github/workflows/build-gh_runner.yml with: - os: macos-12 + os: macos-13 build-type: 'Release' cmake-configuration-ex: '-DUSE_CPPUNIT=OFF -DCLIENTTOOLS_ONLY=ON -DINCLUDE_PLUGINS=OFF -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_PARQUET=OFF -DSUPPRESS_CASSANDRAEMBED=ON -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF' secrets: inherit