diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8bb25eb..e0021ed 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: [3] java: [temurin@17] project: [rootJS, rootJVM] 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@17) id: setup-java-temurin-17 if: matrix.java == 'temurin@17' @@ -68,11 +68,11 @@ jobs: run: sbt githubWorkflowCheck - name: Check headers and formatting - if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck lucumaScalafmtCheck lucumaScalafixCheck - name: Check scalafix lints - if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' 'scalafixAll --check' - name: scalaJSLink @@ -83,11 +83,11 @@ jobs: run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test - name: Check binary compatibility - if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues - name: Generate API documentation - if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc - name: Aggregate coverage reports @@ -102,18 +102,18 @@ jobs: if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master') strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-22.04] java: [temurin@17] 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@17) id: setup-java-temurin-17 if: matrix.java == 'temurin@17' diff --git a/.mergify.yml b/.mergify.yml index e46d737..e76d2d1 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -13,8 +13,8 @@ pull_request_rules: - body~=labels:.*early-semver-patch - body~=labels:.*early-semver-minor - 'title=flake.lock: Update' - - status-success=Build and Test (ubuntu-latest, 3, temurin@17, rootJS) - - status-success=Build and Test (ubuntu-latest, 3, temurin@17, rootJVM) + - status-success=Test (ubuntu-22.04, 3, temurin@17, rootJS) + - status-success=Test (ubuntu-22.04, 3, temurin@17, rootJVM) actions: merge: {} - name: Label core PRs diff --git a/project/plugins.sbt b/project/plugins.sbt index 442f912..c77f850 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("edu.gemini" % "sbt-lucuma-lib" % "0.12.4") +addSbtPlugin("edu.gemini" % "sbt-lucuma-lib" % "0.12.5") -libraryDependencies += "edu.gemini" %% "lucuma-jsdom" % "0.12.4" +libraryDependencies += "edu.gemini" %% "lucuma-jsdom" % "0.12.5"