Skip to content

Commit

Permalink
fix: repo override param (#107)
Browse files Browse the repository at this point in the history
  • Loading branch information
DerekRoberts authored Feb 12, 2025
1 parent f16c757 commit 541a7b1
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-24.04
timeout-minutes: 10
steps:
- uses: bcgov/action-oc-runner@v0.3.0
- uses: bcgov/action-oc-runner@v1.0.0
with:
oc_namespace: ${{ vars.oc_namespace }}
oc_token: ${{ secrets.oc_token }}
Expand Down
14 changes: 9 additions & 5 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,12 @@ runs:
with:
repository: ${{ inputs.repository }}

- uses: bcgov/action-oc-runner@v0.3.0
- uses: bcgov/action-oc-runner@v1.0.0
with:
oc_namespace: ${{ inputs.oc_namespace }}
oc_token: ${{ inputs.oc_token }}
oc_server: ${{ inputs.oc_server }}
repository: ${{ inputs.repository }}
triggers: ${{ inputs.triggers }}
commands: |
# Remove any conflicting ImageStreams
Expand All @@ -120,12 +121,13 @@ runs:
[ ! $(oc get is -o name | grep ^imagestream.image.openshift.io/${i}$) ]|| oc delete is/${i}
done
- uses: bcgov/action-oc-runner@v0.3.0
- uses: bcgov/action-oc-runner@v1.0.0
id: deploy
with:
oc_namespace: ${{ inputs.oc_namespace }}
oc_token: ${{ inputs.oc_token }}
oc_server: ${{ inputs.oc_server }}
repository: ${{ inputs.repository }}
triggers: ${{ inputs.triggers }}
commands: |
# Expand for deployment steps
Expand All @@ -152,11 +154,12 @@ runs:
oc rollout status deploymentconfig/${DDC} -w
fi
- uses: bcgov/action-oc-runner@v0.3.0
- uses: bcgov/action-oc-runner@v1.0.0
with:
oc_namespace: ${{ inputs.oc_namespace }}
oc_token: ${{ inputs.oc_token }}
oc_server: ${{ inputs.oc_server }}
repository: ${{ inputs.repository }}
triggers: ${{ inputs.triggers }}
commands: |
# Expand for route verification
Expand Down Expand Up @@ -199,18 +202,19 @@ runs:
echo -e "\nRoute verification failed"
exit 1
- uses: bcgov/action-oc-runner@v0.3.0
- uses: bcgov/action-oc-runner@v1.0.0
if: inputs.post_rollout != ''
with:
oc_namespace: ${{ inputs.oc_namespace }}
oc_token: ${{ inputs.oc_token }}
oc_server: ${{ inputs.oc_server }}
repository: ${{ inputs.repository }}
triggers: ${{ inputs.triggers }}
commands: |
# Run post deployment command (optional)
${{ inputs.post_rollout }}
- uses: bcgov/action-oc-runner@v0.3.0
- uses: bcgov/action-oc-runner@v1.0.0
if: inputs.delete_completed == 'true'
with:
oc_namespace: ${{ inputs.oc_namespace }}
Expand Down

0 comments on commit 541a7b1

Please sign in to comment.