Skip to content

Commit

Permalink
PR Feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
BillyAutrey committed May 3, 2022
1 parent 76325d6 commit e1c83f4
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 6 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ name: Check
on:
pull_request:

schedule:
- cron: "0 4 * * *" # Nightly build (@daily)
push:
branches:
- main # Check main branch after merge

concurrency:
# Only run once for latest commit per ref and cancel other (previous) runs.
Expand Down Expand Up @@ -46,4 +47,4 @@ jobs:
name: Finish
needs: # Should be last
- "tests"
uses: playframework/.github/.github/workflows/rtm.yml@v1
uses: playframework/.github/.github/workflows/rtm.yml@v1
4 changes: 3 additions & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: Publish

on:
push:
branches: # Snapshots
- main
tags: ["*"] # Releases

jobs:
Expand All @@ -12,4 +14,4 @@ jobs:
username: ${{ secrets.SONATYPE_USERNAME }}
password: ${{ secrets.SONATYPE_PASSWORD }}
pgp_passphrase: ${{ secrets.PGP_PASSPHRASE }}
pgp_secret: ${{ secrets.PGP_SECRET }}
pgp_secret: ${{ secrets.PGP_SECRET }}
12 changes: 10 additions & 2 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
queue_rules:
- name: default
conditions:
# Conditions to get out of the queue (= merged)
- check-success~=/ Ready To Merge$

pull_request_rules:
- name: Merge PRs that are ready
Expand All @@ -10,11 +15,14 @@ pull_request_rules:
- label!=status:block-merge
- label=status:merge-when-green
actions:
merge:
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 e1c83f4

Please sign in to comment.