Skip to content

Commit

Permalink
ci: fix merge tags (again) (#2208)
Browse files Browse the repository at this point in the history
  • Loading branch information
DerekRoberts authored Dec 12, 2024
1 parent dab2053 commit 7f01244
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ jobs:
id: tag
run: |
if [ -z "${{ inputs.pr_no }}" ]; then
echo "tag=${{ steps.pr.outputs.pr }}" >> $GITHUB_ENV
echo "tag=${{ steps.pr.outputs.pr }}" >> $GITHUB_OUTPUT
else
echo "tag=${{ inputs.tag }}" >> $GITHUB_ENV
echo "tag=${{ inputs.tag }}" >> $GITHUB_OUTPUT
fi
# https://github.com/bcgov/quickstart-openshift-helpers
deploy-test:
name: Deploy (test)
name: Deploy (test, tag=${{ needs.vars.outputs.tag }})
uses: ./.github/workflows/.deployer.yml
secrets:
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -56,7 +56,7 @@ jobs:
tag: ${{ needs.vars.outputs.tag }}

deploy-prod:
name: Deploy (prod)
name: Deploy (prod, tag=${{ needs.vars.outputs.tag }})
needs: [deploy-test, vars]
uses: ./.github/workflows/.deployer.yml
secrets:
Expand Down

0 comments on commit 7f01244

Please sign in to comment.