public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.github/workflows/merge-staging.yml: Include branch in comment 

If I receive the mail notification that staging(-next) merge failed,
I either need to check `git log staging-next` or click the action run link
to find out where should I resolve the conflict.

To save time, let’s include the information about which step failed right in the comment.
This commit is contained in:
Jan Tojnar 2021-05-13 12:46:41 +02:00
parent d1601a40c4
commit 6225647cfc
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/merge-staging.yml vendored
View File

@ -14,6 +14,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Merge master into staging-next - name: Merge master into staging-next
id: staging_next
uses: devmasx/merge-branch@v1.3.1 uses: devmasx/merge-branch@v1.3.1
with: with:
type: now type: now
@ -22,6 +23,7 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }} github_token: ${{ secrets.GITHUB_TOKEN }}
- name: Merge staging-next into staging - name: Merge staging-next into staging
id: staging
uses: devmasx/merge-branch@v1.3.1 uses: devmasx/merge-branch@v1.3.1
with: with:
type: now type: now
@ -35,5 +37,5 @@ jobs:
with: with:
issue-number: 105153 issue-number: 105153
body: | body: |
An automatic merge [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}). An automatic merge${{ (steps.staging_next.outcome == 'failure' && ' from master to staging-next') || ((steps.staging.outcome == 'failure' && ' from staging-next to staging') || '') }} [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).