diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 991d37dcd..18d9b4eba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,23 +24,23 @@ concurrency: jobs: build: - name: Build and Test + name: Test strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-22.04] scala: [2.12, 2.13, 3] java: [temurin@8] runs-on: ${{ matrix.os }} timeout-minutes: 60 steps: - - name: Install sbt - uses: sbt/setup-sbt@v1 - - name: Checkout current branch (full) uses: actions/checkout@v4 with: fetch-depth: 0 + - name: Setup sbt + uses: sbt/setup-sbt@v1 + - name: Setup Java (temurin@8) id: setup-java-temurin-8 if: matrix.java == 'temurin@8' @@ -91,18 +91,18 @@ jobs: if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')) strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-22.04] java: [temurin@8] runs-on: ${{ matrix.os }} steps: - - name: Install sbt - uses: sbt/setup-sbt@v1 - - name: Checkout current branch (full) uses: actions/checkout@v4 with: fetch-depth: 0 + - name: Setup sbt + uses: sbt/setup-sbt@v1 + - name: Setup Java (temurin@8) id: setup-java-temurin-8 if: matrix.java == 'temurin@8' diff --git a/.mergify.yml b/.mergify.yml index e7b0dcead..6055c2bc2 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -21,9 +21,9 @@ pull_request_rules: - or: - author=scala-steward - author=scala-steward[bot] - - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8) - - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8) - - status-success=Build and Test (ubuntu-latest, 3, temurin@8) + - status-success=Test (ubuntu-22.04, 2.12, temurin@8) + - status-success=Test (ubuntu-22.04, 2.13, temurin@8) + - status-success=Test (ubuntu-22.04, 3, temurin@8) actions: merge: method: merge