Skip to content

Commit

Permalink
Merge branch 'main' into release/orca
Browse files Browse the repository at this point in the history
  • Loading branch information
barrfalk authored Oct 3, 2024
2 parents 12bd0d4 + bf00440 commit 0f8cb64
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/merge-hotfix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,10 @@ jobs:
runs-on: ubuntu-22.04
timeout-minutes: 1
steps:
- uses: actions/checkout@v4
# Get PR number for squash merges to release
# Get PR number for squash merges to main
- name: PR Number
id: pr
uses: ./.github/actions/get-pr-number
- name: Set PR Output
run: echo "pr=${{ steps.pr.outputs.pr }}" >> $GITHUB_OUTPUT
uses: bcgov-nr/[email protected]

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

0 comments on commit 0f8cb64

Please sign in to comment.