Skip to content

Commit

Permalink
Merge pull request #58 from mkurz/update_ci_conf
Browse files Browse the repository at this point in the history
Make use of reusable workflow
  • Loading branch information
mkurz authored Apr 14, 2022
2 parents 4525dbe + aead25a commit 63547f6
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 28 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Check

on:
push:
branches:
- 2.8.x
pull_request:

concurrency:
# Only run once for latest commit per ref and cancel other (previous) runs.
group: ci-${{ github.ref }}
cancel-in-progress: true

jobs:
tests:
name: Tests
uses: playframework/.github/.github/workflows/sbt-matrix.yml@v1
with: # Should be sync with Mergify conditions (.mergify.yml)
java: >-
[ "17", "11", "8" ]
scala: >-
[ "2.12.15", "2.13.8" ]
cmd: sbt ++$SCALA_VERSION test
25 changes: 0 additions & 25 deletions .github/workflows/ci.yml

This file was deleted.

24 changes: 21 additions & 3 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,37 @@ queue_rules:
- name: default
conditions:
# Conditions to get out of the queue (= merged)
- check-success=Travis CI - Pull Request
- check-success=typesafe-cla-validator
- check-success~=^Tests / Scala 2\.12\.(\d+) & JDK 17$
- check-success~=^Tests / Scala 2\.13\.(\d+) & JDK 17$
- check-success~=^Tests / Scala 2\.12\.(\d+) & JDK 11$
- check-success~=^Tests / Scala 2\.13\.(\d+) & JDK 11$
- check-success~=^Tests / Scala 2\.12\.(\d+) & JDK 8$
- check-success~=^Tests / Scala 2\.13\.(\d+) & JDK 8$

pull_request_rules:
- name: Merge PRs that are ready
conditions:
- check-success=Travis CI - Pull Request
- check-success~=^Tests / Scala 2\.12\.(\d+) & JDK 17$
- check-success~=^Tests / Scala 2\.13\.(\d+) & JDK 17$
- check-success~=^Tests / Scala 2\.12\.(\d+) & JDK 11$
- check-success~=^Tests / Scala 2\.13\.(\d+) & JDK 11$
- check-success~=^Tests / Scala 2\.12\.(\d+) & JDK 8$
- check-success~=^Tests / Scala 2\.13\.(\d+) & JDK 8$
- check-success=typesafe-cla-validator
- "#approved-reviews-by>=1"
- "#review-requested=0"
- "#changes-requested-reviews-by=0"
- label!=status:block-merge
- label=status:merge-when-green
actions:
queue:
method: merge
name: default

- name: Delete the PR branch after merge
conditions:
- merged
actions:
delete_head_branch: {}
label:
remove: [ "status:merge-when-green" ]

0 comments on commit 63547f6

Please sign in to comment.