From ce6eb490cff3b2ca321a9ae768595acc8e5a6c4c Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Fri, 2 Feb 2024 14:00:12 +0000 Subject: [PATCH] osx 14 Github CI uses arm, so removed redundant jobs --- .github/workflows/ci.yml | 81 +++++----------------------------------- 1 file changed, 9 insertions(+), 72 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e3c6ee877..0abcc5335 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -202,59 +202,59 @@ jobs: # cling: On # cling-version: '1.0' # cppyy: On - - name: osx14-x86-clang-clang-repl-17 + - name: osx14-arm-clang-clang-repl-17 os: macos-14 compiler: clang clang-runtime: '17' cling: Off cppyy: Off - - name: osx14-x86-clang-clang-repl-17-cppyy + - name: osx14-arm-clang-clang-repl-17-cppyy os: macos-14 compiler: clang clang-runtime: '17' cling: Off cppyy: On - - name: osx14-x86-clang-clang-repl-17-xeus-clang-repl + - name: osx14-arm-clang-clang-repl-17-xeus-clang-repl os: macos-14 compiler: clang clang-runtime: '17' cling: Off cppyy: On xeus-clang-repl: On - - name: osx14-x86-clang-clang-repl-16 + - name: osx14-arm-clang-clang-repl-16 os: macos-14 compiler: clang clang-runtime: '16' cling: Off cppyy: Off - - name: osx14-x86-clang-clang-repl-16-cppyy + - name: osx14-arm-clang-clang-repl-16-cppyy os: macos-14 compiler: clang clang-runtime: '16' cling: Off cppyy: On - - name: osx14-x86-clang-clang-repl-16-xeus-clang-repl + - name: osx14-arm-clang-clang-repl-16-xeus-clang-repl os: macos-14 compiler: clang clang-runtime: '16' cling: Off cppyy: On xeus-clang-repl: On - - name: osx14-x86-clang-clang13-cling + - name: osx14-arm-clang-clang13-cling os: macos-14 compiler: clang clang-runtime: '13' cling: On cling-version: '1.0' cppyy: Off - - name: osx14-x86-clang-clang13-cling-cppyy + - name: osx14-arm-clang-clang13-cling-cppyy os: macos-14 compiler: clang clang-runtime: '13' cling: On cling-version: '1.0' cppyy: On - - name: osx14-x86-clang-clang13-cling-xeus-clang-repl + - name: osx14-arm-clang-clang13-cling-xeus-clang-repl os: macos-14 compiler: clang clang-runtime: '13' @@ -322,69 +322,6 @@ jobs: cling-version: '1.0' cppyy: On xeus-clang-repl: On - #Block commented out until free tier for m1 - #exists (expected sometime 2024) and key for os - #can be replaced - #- name: osx13-arm64-clang-clang-repl-17 - # os: macos-13-arm64 - # compiler: clang - # clang-runtime: '17' - # cling: Off - # cppyy: Off - #- name: osx13-arm64-clang-clang-repl-17-cppyy - # os: macos-13-arm64 - # compiler: clang - # clang-runtime: '17' - # cling: Off - # cppyy: On - #- name: osx13-arm64-clang-clang-repl-17-xeus-clang-repl - # os: macos-13-arm64 - # compiler: clang - # clang-runtime: '17' - # cling: Off - # cppyy: On - # xeus-clang-repl: On - #- name: osx13-arm64-clang-clang-repl-16 - # os: macos-13-arm64 - # compiler: clang - # clang-runtime: '16' - # cling: Off - # cppyy: Off - #- name: osx13-arm64-clang-clang-repl-16-cppyy - # os: macos-13-arm64 - # compiler: clang - # clang-runtime: '16' - # cling: Off - # cppyy: On - #- name: osx13-arm64-clang-clang-repl-16-xeus-clang-repl - # os: macos-13-arm64 - # compiler: clang - # clang-runtime: '16' - # cling: Off - # cppyy: On - # xeus-clang-repl: On - #- name: osx13-arm64-clang-clang13-cling - # os: macos-13-arm64 - # compiler: clang - # clang-runtime: '13' - # cling: On - # cling-version: '1.0' - # cppyy: Off - #- name: osx13-arm64-clang-clang13-cling-cppyy - # os: macos-13-arm64 - # compiler: clang - # clang-runtime: '13' - # cling: On - # cling-version: '1.0' - # cppyy: On - #- name: osx13-arm64-clang-clang13-cling-xeus-clang-repl - # os: macos-13-arm64 - # compiler: clang - # clang-runtime: '13' - # cling: On - # cling-version: '1.0' - # cppyy: On - # xeus-clang-repl: On steps: - uses: actions/checkout@v3