diff options
| author | Domen Kožar <domen@dev.si> | 2021-05-14 16:09:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-14 16:09:14 +0200 |
| commit | a96c617beaf727725773df2a07dc7744d57be071 (patch) | |
| tree | 69cb5d725e08c794fdc29c4e616da313d3d99a8a | |
| parent | 6220c3ed54a70fe5d6edd90e976596227ac45805 (diff) | |
| parent | 6225647cfc829df39c46e4d02c28cea1f029b7db (diff) | |
Merge pull request #122814 from jtojnar/staging-merge-comment
.github/workflows/merge-staging.yml: Include branch in comment
| -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 1aadef16328a5..f28c2ddfc7899 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 }}). |