diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-05-13 12:46:41 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-05-13 13:58:14 +0200 |
| commit | 6225647cfc829df39c46e4d02c28cea1f029b7db (patch) | |
| tree | f95de44434a19d6dd4e86b552c0a2e7c79b616a8 /.github | |
| parent | d1601a40c48426ae460eede1675fd1d6ee23e198 (diff) | |
| download | nixpkgs-6225647cfc829df39c46e4d02c28cea1f029b7db.tar nixpkgs-6225647cfc829df39c46e4d02c28cea1f029b7db.tar.gz nixpkgs-6225647cfc829df39c46e4d02c28cea1f029b7db.tar.bz2 nixpkgs-6225647cfc829df39c46e4d02c28cea1f029b7db.tar.lz nixpkgs-6225647cfc829df39c46e4d02c28cea1f029b7db.tar.xz nixpkgs-6225647cfc829df39c46e4d02c28cea1f029b7db.tar.zst nixpkgs-6225647cfc829df39c46e4d02c28cea1f029b7db.zip | |
.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.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/merge-staging.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.github/workflows/merge-staging.yml b/.github/workflows/merge-staging.yml index 1aadef16328..f28c2ddfc78 100644 --- a/.github/workflows/merge-staging.yml +++ b/.github/workflows/merge-staging.yml @@ -14,6 +14,7 @@ jobs: - uses: actions/checkout@v2 - name: Merge master into staging-next + id: staging_next uses: devmasx/merge-branch@v1.3.1 with: type: now @@ -22,6 +23,7 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} - name: Merge staging-next into staging + id: staging uses: devmasx/merge-branch@v1.3.1 with: type: now @@ -35,5 +37,5 @@ jobs: with: issue-number: 105153 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 }}). |