From d85cb2a695ca84019b9ffd41f08df2d1302dcd04 Mon Sep 17 00:00:00 2001 From: Glenn Date: Sat, 31 Aug 2024 20:12:41 -0700 Subject: [PATCH] approve instead of merge --- .github/workflows/bypass-css-review.yaml | 6 +++--- .github/workflows/bypass-version-review.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/bypass-css-review.yaml b/.github/workflows/bypass-css-review.yaml index 36646b6a..b8f44a0e 100644 --- a/.github/workflows/bypass-css-review.yaml +++ b/.github/workflows/bypass-css-review.yaml @@ -22,11 +22,11 @@ jobs: exit 1 fi - - name: Check for CSS files and merge if conditions are met + - name: Check for CSS files and approve if conditions are met run: | if git diff --name-only main ${{ github.head_ref }} | grep -q '\.css$'; then - echo "CSS files detected and user is an admin, bypassing review requirement" - gh pr merge ${{ github.event.pull_request.number }} --auto --squash + echo "CSS files detected and user is an admin, approving PR" + gh pr review ${{ github.event.pull_request.number }} --approve --body "Approved: CSS file changes detected and user is an admin." else echo "No CSS files detected or user is not an admin, continuing with normal review process" fi diff --git a/.github/workflows/bypass-version-review.yaml b/.github/workflows/bypass-version-review.yaml index b0021148..2b6e84c0 100644 --- a/.github/workflows/bypass-version-review.yaml +++ b/.github/workflows/bypass-version-review.yaml @@ -22,11 +22,11 @@ jobs: exit 1 fi - - name: Check for hushline/version.py and merge if conditions are met + - name: Check for hushline/version.py and approve if conditions are met run: | if git diff --name-only main ${{ github.head_ref }} | grep -q '^hushline/version.py$'; then - echo "hushline/version.py detected and user is an admin, bypassing review requirement" - gh pr merge ${{ github.event.pull_request.number }} --auto --squash + echo "hushline/version.py detected and user is an admin, approving PR" + gh pr review ${{ github.event.pull_request.number }} --approve --body "Approved: hushline/version.py changes detected and user is an admin." else echo "No matching files detected or user is not an admin, continuing with normal review process" fi