diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e28a7a..6401cbc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.14, 3.3.3] - java: [temurin@8] + java: [zulu@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -32,14 +32,17 @@ jobs: with: fetch-depth: 0 - - name: Setup Java (temurin@8) - if: matrix.java == 'temurin@8' + - name: Setup Java (zulu@8) + if: matrix.java == 'zulu@8' uses: actions/setup-java@v4 with: - distribution: temurin + distribution: zulu java-version: 8 cache: sbt + - name: Setup sbt + uses: sbt/setup-sbt@v1 + - name: Check that workflows are up to date run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck @@ -63,7 +66,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [3.3.3] - java: [temurin@8] + java: [zulu@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -71,14 +74,17 @@ jobs: with: fetch-depth: 0 - - name: Setup Java (temurin@8) - if: matrix.java == 'temurin@8' + - name: Setup Java (zulu@8) + if: matrix.java == 'zulu@8' uses: actions/setup-java@v4 with: - distribution: temurin + distribution: zulu java-version: 8 cache: sbt + - name: Setup sbt + uses: sbt/setup-sbt@v1 + - name: Download target directories (2.13.14) uses: actions/download-artifact@v4 with: diff --git a/.mergify.yml b/.mergify.yml index fa886b4..981d2fd 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,15 +1,15 @@ defaults: {} queue_rules: - name: default - conditions: [] + merge_conditions: [] pull_request_rules: - name: Automatically merge successful Scala Steward PRs conditions: - or: - author=scala-steward - author=nafg-scala-steward[bot] - - check-success=Build and Test (ubuntu-latest, 2.13.14, temurin@8) - - check-success=Build and Test (ubuntu-latest, 3.3.3, temurin@8) + - check-success=Build and Test (ubuntu-latest, 2.13.14, zulu@8) + - check-success=Build and Test (ubuntu-latest, 3.3.3, zulu@8) actions: queue: name: default diff --git a/project/plugins.sbt b/project/plugins.sbt index fcc9b7a..161cc72 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1") -addSbtPlugin("io.github.nafg.mergify" % "sbt-mergify-github-actions" % "0.8.2") +addSbtPlugin("io.github.nafg.mergify" % "sbt-mergify-github-actions" % "0.9.0") libraryDependencies += "io.github.nafg.scalac-options" %% "scalac-options" % "0.3.0"