diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d0153a4bec..a894344469 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,14 +41,14 @@ jobs: java_distribution: [ temurin ] java_version: [ 8, 11, 17, 21 ] scala_version: [ 2.12.20 ] - os: [ ubuntu-22.04, windows-2022, macos-12 ] + os: [ ubuntu-22.04, windows-2022, macos-14 ] exclude: # only run macos on java 17 - - os: macos-12 + - os: macos-14 java_version: 8 - - os: macos-12 + - os: macos-14 java_version: 11 - - os: macos-12 + - os: macos-14 java_version: 21 include: # configure shell/cc/ar for all OSes @@ -60,7 +60,7 @@ jobs: shell: msys2 {0} env_cc: clang env_ar: llvm-ar - - os: macos-12 + - os: macos-14 shell: bash env_cc: cc env_ar: ar @@ -103,11 +103,24 @@ jobs: ############################################################ - name: Install Dependencies (macOS) + if: runner.os == 'macOS' + run: brew install sbt + + - name: Check out mxml source (macOS) + if: runner.os == 'macOS' + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + with: + repository: michaelrsweet/mxml + ref: v3.3 + path: mxml + + - name: Install mxml library (macOS) if: runner.os == 'macOS' run: | - brew tap-new local/libmxml - brew extract --version 3.3.1 libmxml local/libmxml - brew install libmxml@3.3.1 + cd mxml + ./configure --prefix=/usr/local + make + sudo make install - name: Install Dependencies (Linux) if: runner.os == 'Linux'