diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index b56be8e..95031db 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-latest] steps: - name: Checkout uses: actions/checkout@v4 @@ -46,7 +46,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-latest] needs: gradle-save steps: - name: Checkout @@ -70,7 +70,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-latest] steps: - name: Checkout uses: actions/checkout@v4 @@ -93,7 +93,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-latest] needs: maven-save steps: - name: Checkout @@ -121,7 +121,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-latest] steps: - name: Checkout uses: actions/checkout@v4 @@ -132,17 +132,21 @@ jobs: distribution: 'adopt' java-version: '11' cache: sbt + - name: Setup SBT + if: matrix.os == 'macos-13' + run: | + echo ""Installing SBT..."" + brew install sbt - name: Create files to cache run: sbt update - name: Check files to cache on macos-latest - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-13' run: | if [ ! -d ~/Library/Caches/Coursier ]; then echo "::error::The ~/Library/Caches/Coursier directory does not exist unexpectedly" exit 1 fi - - name: Check files to cache on windows-latest if: matrix.os == 'windows-latest' run: | @@ -150,7 +154,6 @@ jobs: echo "::error::The ~/AppData/Local/Coursier/Cache directory does not exist unexpectedly" exit 1 fi - - name: Check files to cache on ubuntu-latest if: matrix.os == 'ubuntu-latest' run: | @@ -158,7 +161,6 @@ jobs: echo "::error::The ~/.cache/coursier directory does not exist unexpectedly" exit 1 fi - sbt-restore: runs-on: ${{ matrix.os }} defaults: @@ -168,7 +170,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-latest] needs: sbt-save steps: - name: Checkout @@ -182,14 +184,13 @@ jobs: cache: sbt - name: Confirm that ~/Library/Caches/Coursier directory has been made - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-13' run: | if [ ! -d ~/Library/Caches/Coursier ]; then echo "::error::The ~/Library/Caches/Coursier directory does not exist unexpectedly" exit 1 fi ls ~/Library/Caches/Coursier - - name: Confirm that ~/AppData/Local/Coursier/Cache directory has been made if: matrix.os == 'windows-latest' run: | @@ -198,7 +199,6 @@ jobs: exit 1 fi ls ~/AppData/Local/Coursier/Cache - - name: Confirm that ~/.cache/coursier directory has been made if: matrix.os == 'ubuntu-latest' run: | diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index 972d1cc..0553d91 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -47,7 +47,7 @@ jobs: version: 20 - distribution: oracle os: ubuntu-latest - version: 20 + version: 20 steps: - name: Checkout