diff --git a/.github/mergify.yml b/.github/mergify.yml new file mode 100644 index 0000000..1258555 --- /dev/null +++ b/.github/mergify.yml @@ -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 diff --git a/.github/workflows/upsert-scala-steward-dependencies-branch.yml b/.github/workflows/upsert-scala-steward-dependencies-branch.yml new file mode 100644 index 0000000..2d80d44 --- /dev/null +++ b/.github/workflows/upsert-scala-steward-dependencies-branch.yml @@ -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