Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update merge workflow handling of PR number inputs #5

Merged
merged 1 commit into from
Nov 29, 2024
Merged

fix: update merge workflow handling of PR number inputs #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions .github/workflows/merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,24 @@ jobs:
vars:
name: Set Variables
outputs:
pr: ${{ steps.pr.outputs.pr }}
pr: ${{ steps.pr-selector.outputs.pr }}
runs-on: ubuntu-24.04
timeout-minutes: 1
steps:
# Get PR number for squash merges to main
# Get PR number for squash merges to main if not specified as input
- name: PR Number
id: pr
if: github.event.inputs.pr_no == null
uses: bcgov-nr/[email protected]
# Get the appropriate PR number output value depending on whether input was specified
- name: PR Number Selector
id: pr-selector
run: |
if [[ "${{ github.event.inputs.pr_no }}" == "" ]]; then
echo "pr=${{ steps.pr.outputs.pr }}" >> $GITHUB_OUTPUT
else
echo "pr=${{ github.event.inputs.pr_no }}" >> $GITHUB_OUTPUT
fi

# https://github.com/bcgov/quickstart-openshift-helpers
deploy-test:
Expand Down
Loading