From 3634d7692adae250224264f7587967052da76f21 Mon Sep 17 00:00:00 2001 From: Davin Shearer <2205472+scholarsmate@users.noreply.github.com> Date: Mon, 25 Nov 2024 13:07:43 -0500 Subject: [PATCH] retire macos-12, and add macos-15 to CI --- .github/workflows/release.yml | 20 +------------------- .github/workflows/tests.yml | 12 ++---------- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a325298a..41bf30ff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,15 +61,6 @@ jobs: checkName: "TypeScript code is properly formatted" ref: ${{ github.event.pull_request.head.sha || github.sha }} - - name: Check tests - macOS 12 ✅ - uses: fountainhead/action-wait-for-check@v1.2.0 - id: macos12-tests - with: - token: ${{ secrets.GITHUB_TOKEN }} - # This check name is defined as the github action job name (in .github/workflows/testing.yaml) - checkName: "Build middleware macos-12 🔧" - ref: ${{ github.event.pull_request.head.sha || github.sha }} - - name: Check tests - macOS 14 ✅ uses: fountainhead/action-wait-for-check@v1.2.0 id: macos14-tests @@ -217,7 +208,7 @@ jobs: name: ubuntu-20.04-arm64-libomega_edit.so path: _install/libomega_edit_linux_aarch64.so - - name: Download macos-12 library file 🔻 + - name: Download macos-14 library file 🔻 uses: dawidd6/action-download-artifact@v6 with: workflow: tests.yml @@ -226,15 +217,6 @@ jobs: name: macos-14-arm64-libomega_edit.dylib path: _install/libomega_edit_macos_aarch64.dylib - - name: Download macos-14 library file 🔻 - uses: dawidd6/action-download-artifact@v6 - with: - workflow: tests.yml - branch: main - workflow_conclusion: success - name: macos-12-x64-libomega_edit.dylib - path: _install/libomega_edit_macos_x86_64.dylib - - name: Download windows library file 🔻 uses: dawidd6/action-download-artifact@v6 with: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 45c9ff9c..bd9d31b7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,11 +21,7 @@ jobs: strategy: matrix: # NOTE: build on older OS versions to support older OS versions - # macos-14 is m1 mac - # macos-13 not used as it doesn't by default have sbt installed. - # if macos-12 is updated to 13 SBT needs to be installed before - # trying to run it for every workflow using this os. - os: [ windows-2019, macos-12, ubuntu-20.04, macos-14 ] + os: [ windows-2019, ubuntu-20.04, macos-14 ] fail-fast: false # don't immediately fail all other jobs if a single job fails name: Native build and test on ${{ matrix.os }} 🦙 runs-on: ${{ matrix.os }} @@ -62,11 +58,7 @@ jobs: strategy: matrix: # NOTE: build on older OS versions to support older OS versions - # macos-14 is m1 mac - # macos-13 not used as it doesn't by default have sbt installed. - # if macos-12 is updated to 13 SBT needs to be installed before - # trying to run it for every workflow using this os. - os: [ windows-2019, macos-12, ubuntu-20.04, macos-14 ] + os: [ windows-2019, ubuntu-20.04, macos-14 ] fail-fast: false runs-on: ${{ matrix.os }} name: Build middleware ${{ matrix.os }} 🔧