From bf5a4faa18a9fcd6912528c40caeea6d02397851 Mon Sep 17 00:00:00 2001 From: Davin Shearer <2205472+scholarsmate@users.noreply.github.com> Date: Mon, 9 Dec 2024 11:18:34 -0500 Subject: [PATCH] retire macos-12 from CI (#1032) * retire macos-12 from CI * add macos-13 to replace macos-12 since x86 based --------- Co-authored-by: Shane Dell --- .github/workflows/build-middleware/action.yml | 6 ++++-- .github/workflows/release.yml | 20 +++++++++---------- .github/workflows/tests.yml | 14 ++----------- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build-middleware/action.yml b/.github/workflows/build-middleware/action.yml index c83619a8..287a823e 100644 --- a/.github/workflows/build-middleware/action.yml +++ b/.github/workflows/build-middleware/action.yml @@ -47,10 +47,12 @@ runs: cache: sbt if: contains(inputs.os-name, 'macos-14') - - name: Install SBT - macos-14 # if macos-13 is added this will done for it as well + - name: Install SBT - macos-13 & macos-14 shell: bash run: brew install sbt - if: contains(inputs.os-name, 'macos-14') + if: | + contains(inputs.os-name, 'macos-13') || + contains(inputs.os-name, 'macos-14') - name: Make _install directory to store lib files 🔧 shell: bash diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 354f1957..5a9b27fc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,13 +61,13 @@ jobs: checkName: "TypeScript code is properly formatted" ref: ${{ github.event.pull_request.head.sha || github.sha }} - - name: Check tests - macOS 12 ✅ + - name: Check tests - macOS 13 ✅ uses: fountainhead/action-wait-for-check@v1.2.0 - id: macos12-tests + id: macos13-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 🔧" + checkName: "Build middleware macos-13 🔧" ref: ${{ github.event.pull_request.head.sha || github.sha }} - name: Check tests - macOS 14 ✅ @@ -111,7 +111,7 @@ jobs: steps.rat-check.outputs.conclusion != 'success' || steps.scala-format.outputs.conclusion != 'success' || steps.ts-format.outputs.conclusion != 'success' || - steps.macos12-tests.outputs.conclusion != 'success' || + steps.macos13-tests.outputs.conclusion != 'success' || steps.macos14-tests.outputs.conclusion != 'success' || steps.ubuntu-tests.outputs.conclusion != 'success' || steps.ubuntu-arm64-native.outputs.conclusion != 'success' || @@ -120,7 +120,7 @@ jobs: echo "Rat Check Status: ${{ steps.rat-check.conclusion }}" echo "Scala Format Status: ${{ steps.scala-format.conclusion }}" echo "Typescript Format Status: ${{ steps.ts-format.conclusion }}" - echo "MacOS 12 Test Status: ${{ steps.macos12-tests.outputs.conclusion }}" + echo "MacOS 13 Test Status: ${{ steps.macos13-tests.outputs.conclusion }}" echo "MacOS 14 Test Status: ${{ steps.macos14-tests.outputs.conclusion }}" echo "Ubuntu Test Status: ${{ steps.ubuntu-tests.conclusion }}" echo "Ubuntu ARM64 Native Status: ${{ steps.ubuntu-arm64-native.conclusion }}" @@ -217,14 +217,14 @@ 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-13 library file 🔻 uses: dawidd6/action-download-artifact@v7 with: workflow: tests.yml branch: main workflow_conclusion: success - name: macos-14-arm64-libomega_edit.dylib - path: _install/libomega_edit_macos_aarch64.dylib + name: macos-13-x64-libomega_edit.dylib + path: _install/libomega_edit_macos_x86_64.dylib - name: Download macos-14 library file 🔻 uses: dawidd6/action-download-artifact@v7 @@ -232,8 +232,8 @@ jobs: workflow: tests.yml branch: main workflow_conclusion: success - name: macos-12-x64-libomega_edit.dylib - path: _install/libomega_edit_macos_x86_64.dylib + name: macos-14-arm64-libomega_edit.dylib + path: _install/libomega_edit_macos_aarch64.dylib - name: Download windows library file 🔻 uses: dawidd6/action-download-artifact@v7 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 45c9ff9c..09ef1bd0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,12 +20,7 @@ jobs: build-native: 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, macos-13, 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 }} @@ -61,12 +56,7 @@ jobs: needs: [ build-native ] 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, macos-13, ubuntu-20.04, macos-14 ] fail-fast: false runs-on: ${{ matrix.os }} name: Build middleware ${{ matrix.os }} 🔧