Skip to content

Commit

Permalink
Merge branch 'master' into version-bump-80613251461
Browse files Browse the repository at this point in the history
  • Loading branch information
thanhz authored Feb 27, 2024
2 parents b01a488 + e02f6ac commit 0a19829
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 1 deletion.
20 changes: 20 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
queue_rules:
- name: default
conditions:
- "check-success=test"
- "check-success=security/snyk (nationalarchives)"
pull_request_rules:
- name: automatic merge for Scala Steward
conditions:
- author=tna-digital-archiving-jenkins
- "check-success=test"
- "check-success=security/snyk (nationalarchives)"
- or:
- files=build.sbt
- files~=^(!?project/)
actions:
review:
type: APPROVE
message: Automatically approving Scala Steward
queue:
name: default
20 changes: 20 additions & 0 deletions .github/workflows/upsert-scala-steward-dependencies-branch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Upsert `scala-steward-dependencies` branch

on:
push:
branches: master
jobs:
upsert-develop-branch:
permissions: write-all
runs-on: ubuntu-latest
name: Rebase `scala-steward-dependencies` branch to latest `origin/master`
steps:
- name: Checkout scala-steward-dependencies branch
uses: actions/checkout@v2
with:
ref: scala-steward-dependencies
fetch-depth: 0
- name: Rebase `scala-steward-dependencies` branch to latest `origin/master`
run: |
git rebase origin/master
git push -f -u origin scala-steward-dependencies
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.8
sbt.version=1.9.9

0 comments on commit 0a19829

Please sign in to comment.