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 800a4b72..5a9b27fc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,6 +61,15 @@ jobs: checkName: "TypeScript code is properly formatted" ref: ${{ github.event.pull_request.head.sha || github.sha }} + - name: Check tests - macOS 13 ✅ + uses: fountainhead/action-wait-for-check@v1.2.0 + 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-13 🔧" + 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 @@ -102,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' || @@ -111,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 }}" @@ -208,14 +217,14 @@ jobs: name: ubuntu-20.04-arm64-libomega_edit.so path: _install/libomega_edit_linux_aarch64.so - - name: Download macos-14 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 @@ -223,8 +232,8 @@ jobs: workflow: tests.yml branch: main workflow_conclusion: success - name: macos-14-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 bd9d31b7..09ef1bd0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,8 +20,7 @@ jobs: build-native: strategy: matrix: - # NOTE: build on older OS versions to support older OS versions - os: [ windows-2019, 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 }} @@ -57,8 +56,7 @@ jobs: needs: [ build-native ] strategy: matrix: - # NOTE: build on older OS versions to support older OS versions - os: [ windows-2019, 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 }} 🔧