Skip to content

Commit 6be7db2

Browse files
authoredSep 27, 2024··
Merge pull request #94 from slick/update/sbt-mergify-github-actions-0.9.0
Update sbt-mergify-github-actions to 0.9.0
2 parents 5041de0 + a2b8dd5 commit 6be7db2

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed
 

‎.github/workflows/ci.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,25 @@ jobs:
2323
matrix:
2424
os: [ubuntu-latest]
2525
scala: [2.12.19]
26-
java: [temurin@8]
26+
java: [zulu@8]
2727
runs-on: ${{ matrix.os }}
2828
steps:
2929
- name: Checkout current branch (full)
3030
uses: actions/checkout@v4
3131
with:
3232
fetch-depth: 0
3333

34-
- name: Setup Java (temurin@8)
35-
if: matrix.java == 'temurin@8'
34+
- name: Setup Java (zulu@8)
35+
if: matrix.java == 'zulu@8'
3636
uses: actions/setup-java@v4
3737
with:
38-
distribution: temurin
38+
distribution: zulu
3939
java-version: 8
4040
cache: sbt
4141

42+
- name: Setup sbt
43+
uses: sbt/setup-sbt@v1
44+
4245
- name: Check that workflows are up to date
4346
run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck
4447

‎.mergify.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
defaults: {}
22
queue_rules:
33
- name: default
4-
conditions: []
4+
merge_conditions: []
55
pull_request_rules:
66
- name: Automatically merge successful Scala Steward PRs
77
conditions:
88
- or:
99
- author=scala-steward
1010
- author=slick-scala-steward[bot]
1111
- author=renovate[bot]
12-
- check-success=Build and Test (ubuntu-latest, 2.12.19, temurin@8)
12+
- check-success=Build and Test (ubuntu-latest, 2.12.19, zulu@8)
1313
actions:
1414
queue:
1515
name: default

‎project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("io.github.nafg.mergify" % "sbt-mergify-github-actions" % "0.8.2")
1+
addSbtPlugin("io.github.nafg.mergify" % "sbt-mergify-github-actions" % "0.9.0")

0 commit comments

Comments
 (0)
Please sign in to comment.