Move macos CI to arm

This commit is contained in:
Adrian Insaurralde Avalos
2024-03-15 11:18:47 -03:00
committed by Chris Hennes
parent 233a61e54e
commit aabb6124b1
2 changed files with 12 additions and 13 deletions

View File

@@ -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,

View File

@@ -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