diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef7db57..f220c4c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,24 +24,24 @@ 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] project: [disciplineNative, disciplineJS, disciplineJVM] 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' @@ -59,7 +59,7 @@ jobs: run: sbt githubWorkflowCheck - name: Check headers and formatting - if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck - name: nativeLink @@ -74,11 +74,11 @@ jobs: run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test - name: Check binary compatibility - if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues - name: Generate API documentation - if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc - name: Make target directories @@ -102,18 +102,18 @@ jobs: if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') 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' @@ -246,18 +246,18 @@ jobs: if: github.event.repository.fork == false && github.event_name != 'pull_request' 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 84b6d35..8e66f7b 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -10,15 +10,15 @@ pull_request_rules: conditions: - author=scala-steward - body~=labels:.*early-semver-patch - - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, disciplineNative) - - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, disciplineJS) - - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, disciplineJVM) - - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, disciplineNative) - - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, disciplineJS) - - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, disciplineJVM) - - status-success=Build and Test (ubuntu-latest, 3, temurin@8, disciplineNative) - - status-success=Build and Test (ubuntu-latest, 3, temurin@8, disciplineJS) - - status-success=Build and Test (ubuntu-latest, 3, temurin@8, disciplineJVM) + - status-success=Test (ubuntu-22.04, 2.12, temurin@8, disciplineNative) + - status-success=Test (ubuntu-22.04, 2.12, temurin@8, disciplineJS) + - status-success=Test (ubuntu-22.04, 2.12, temurin@8, disciplineJVM) + - status-success=Test (ubuntu-22.04, 2.13, temurin@8, disciplineNative) + - status-success=Test (ubuntu-22.04, 2.13, temurin@8, disciplineJS) + - status-success=Test (ubuntu-22.04, 2.13, temurin@8, disciplineJVM) + - status-success=Test (ubuntu-22.04, 3, temurin@8, disciplineNative) + - status-success=Test (ubuntu-22.04, 3, temurin@8, disciplineJS) + - status-success=Test (ubuntu-22.04, 3, temurin@8, disciplineJVM) actions: merge: {} - name: Label core PRs diff --git a/project/plugins.sbt b/project/plugins.sbt index c1b648a..558fb0e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -val sbtTlVersion = "0.7.4" +val sbtTlVersion = "0.7.5" addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTlVersion) addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % sbtTlVersion) addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")