Move macos CI to arm
This commit is contained in:
committed by
Chris Hennes
parent
43ddbb4936
commit
890ea256c5
23
.github/workflows/CI_master.yml
vendored
23
.github/workflows/CI_master.yml
vendored
@@ -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,
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user