diff --git a/.github/workflows/kube-actions.yaml b/.github/workflows/kube-actions.yaml index 6ca82bd..5d24f80 100644 --- a/.github/workflows/kube-actions.yaml +++ b/.github/workflows/kube-actions.yaml @@ -31,8 +31,6 @@ jobs: PR_NUMBER=$(jq -r '.issue.number' $GITHUB_EVENT_PATH) COMMENT_USER=$(jq -r '.comment.user.login' $GITHUB_EVENT_PATH) - echo $COMMENT_BODY - while IFS= read -r COMMENT_LINE; do COMMENT_LINE=$(echo "$COMMENT_LINE" | sed 's/^[ \t]*//;s/[ \t]*$//' | tr -d '\n' | awk '{$1=$1};1') LABEL=$(echo "$COMMENT_LINE" | awk '{print $2}') @@ -96,13 +94,7 @@ jobs: fi done <<< "$COMMENT_BODY" - - name: Merge PR if LGTMed and approved - env: - GH_TOKEN: ${{ secrets.AGENT_TOKEN }} - run: | - PR_NUMBER=$(jq -r '.issue.number' $GITHUB_EVENT_PATH) - LABELS=$(gh pr view $PR_NUMBER --json labels --jq '.labels[].name') - + # Merge PR if LGTMed and approved and do not hold. if [[ "$LABELS" == *"lgtm"* && "$LABELS" == *"approved"* && "$LABELS" != *"do-not-merge/hold"* ]]; then gh pr merge $PR_NUMBER --merge else