diff --git a/.github/workflows/issues-updates-on-merge.yml b/.github/workflows/issues-updates-on-merge.yml index a0f091c34..13a3452b8 100644 --- a/.github/workflows/issues-updates-on-merge.yml +++ b/.github/workflows/issues-updates-on-merge.yml @@ -29,11 +29,13 @@ jobs: env: GH_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }} run: | - for ISSUE in $(echo $issues | jq -r '.[]'); do - echo "Updating issue #$ISSUE" + for ISSUE in $(echo $issues | jq -r '.[]'); do if [ "${{ github.ref }}" == "refs/heads/staging" ]; then - gh issue edit $ISSUE -R ${{ github.repository }} --add-label "✅ Done (staging)" + LABEL="✅ Done (staging)" + gh issue edit $ISSUE -R ${{ github.repository }} --add-label "$LABEL" elif [ "${{ github.ref }}" == "refs/heads/release" ]; then - gh issue edit $ISSUE -R ${{ github.repository }} --add-label "✅ Done" + LABEL="✅ Done" + gh issue edit $ISSUE -R ${{ github.repository }} --add-label "$LABEL" fi - done + echo "Added label '$LABEL' to issue #$ISSUE" + done diff --git a/.github/workflows/pr-auto-manager.yml b/.github/workflows/pr-auto-manager.yml index 35cfabd8c..d2cf29ee4 100644 --- a/.github/workflows/pr-auto-manager.yml +++ b/.github/workflows/pr-auto-manager.yml @@ -177,6 +177,6 @@ jobs: GH_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }} run: | for ISSUE in $(echo $final_issues | jq -r '.[]'); do - echo "Updating issue #$ISSUE" gh issue edit $ISSUE -R ${{ github.repository }} --add-label "✅ Done (staging)" + echo "Added label '✅ Done (staging)' to issue #$ISSUE" done diff --git a/.github/workflows/pr-check-merge-conflicts.yaml b/.github/workflows/pr-check-merge-conflicts.yaml index 553ef40c9..7f6e568f3 100644 --- a/.github/workflows/pr-check-merge-conflicts.yaml +++ b/.github/workflows/pr-check-merge-conflicts.yaml @@ -1,4 +1,4 @@ -name: 🎯 Push Handler +name: 🎯 Check Merge Conflicts on: # So that PRs touching the same files as the push are updated