Skip to content

Commit

Permalink
Merge pull request #94 from slick/update/sbt-mergify-github-actions-0…
Browse files Browse the repository at this point in the history
….9.0

Update sbt-mergify-github-actions to 0.9.0
  • Loading branch information
nafg authored Sep 27, 2024
2 parents 5041de0 + a2b8dd5 commit 6be7db2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,25 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [2.12.19]
java: [temurin@8]
java: [zulu@8]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v4
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

Expand Down
4 changes: 2 additions & 2 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -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=slick-scala-steward[bot]
- author=renovate[bot]
- check-success=Build and Test (ubuntu-latest, 2.12.19, temurin@8)
- check-success=Build and Test (ubuntu-latest, 2.12.19, zulu@8)
actions:
queue:
name: default
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +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")

0 comments on commit 6be7db2

Please sign in to comment.