From aabb6124b121b86edf7c81c21cc645786d39adbb Mon Sep 17 00:00:00 2001 From: Adrian Insaurralde Avalos Date: Fri, 15 Mar 2024 11:18:47 -0300 Subject: [PATCH] Move macos CI to arm --- .github/workflows/CI_master.yml | 23 +++++++++---------- .../workflows/sub_buildMacOSCondaApple.yml | 2 +- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/CI_master.yml b/.github/workflows/CI_master.yml index 44b40ede93..0723bc09a0 100644 --- a/.github/workflows/CI_master.yml +++ b/.github/workflows/CI_master.yml @@ -39,18 +39,17 @@ jobs: with: artifactBasename: Prepare-${{ github.run_id }} - # GA in Jan-Mar 2024 Timeframe: https://github.com/actions/runner-images/issues/8439#issuecomment-1755601587 - # MacOS_13_Conda_Apple: - # needs: [Prepare] - # uses: ./.github/workflows/sub_buildMacOSCondaApple.yml - # with: - # artifactBasename: MacOS_13_Conda_Apple-${{ github.run_id }} - - MacOS_13_Conda_Intel: + MacOS_13_Conda_Apple: needs: [Prepare] - uses: ./.github/workflows/sub_buildMacOSCondaIntel.yml + uses: ./.github/workflows/sub_buildMacOSCondaApple.yml with: - artifactBasename: MacOS_13_Conda_Intel-${{ github.run_id }} + artifactBasename: MacOS_13_Conda_Apple-${{ github.run_id }} + +# MacOS_13_Conda_Intel: +# needs: [Prepare] +# uses: ./.github/workflows/sub_buildMacOSCondaIntel.yml +# with: +# artifactBasename: MacOS_13_Conda_Intel-${{ github.run_id }} Ubuntu_20-04: needs: [Prepare] @@ -88,8 +87,8 @@ jobs: WrapUp: needs: [ Prepare, - # MacOS_13_Conda_Apple, - MacOS_13_Conda_Intel, + MacOS_13_Conda_Apple, + # MacOS_13_Conda_Intel, Ubuntu_20-04, Ubuntu_22-04_Conda, Windows, diff --git a/.github/workflows/sub_buildMacOSCondaApple.yml b/.github/workflows/sub_buildMacOSCondaApple.yml index ee5ba55b7b..8313daa082 100644 --- a/.github/workflows/sub_buildMacOSCondaApple.yml +++ b/.github/workflows/sub_buildMacOSCondaApple.yml @@ -45,7 +45,7 @@ on: jobs: Build: - runs-on: macos-13-xlarge + runs-on: macos-14 continue-on-error: ${{ inputs.allowedToFail }} env: CCACHE_DIR: ${{ github.workspace }}/ccache