From 040bdb17bff0e365c27bb116c1aca2eda2f9bb5e Mon Sep 17 00:00:00 2001 From: Alex Urbina Date: Thu, 23 May 2024 09:38:58 -0600 Subject: [PATCH] BRE-87 TEST: disable merge --- .github/workflows/version-bump.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml index b6d3f2d47..710dc0e7c 100644 --- a/.github/workflows/version-bump.yml +++ b/.github/workflows/version-bump.yml @@ -195,12 +195,12 @@ jobs: PR_NUMBER: ${{ steps.create-pr.outputs.pr_number }} run: gh pr review $PR_NUMBER --approve - - name: Merge PR - if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }} - env: - GH_TOKEN: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }} - PR_NUMBER: ${{ steps.create-pr.outputs.pr_number }} - run: gh pr merge $PR_NUMBER --squash --auto --delete-branch + #- name: Merge PR + # if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }} + # env: + # GH_TOKEN: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }} + # PR_NUMBER: ${{ steps.create-pr.outputs.pr_number }} + # run: gh pr merge $PR_NUMBER --squash --auto --delete-branch - name: Report upcoming release version to Slack if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }} && ${{ inputs.enable_slack_notification == true }}