chore(ci): handle gh runner oc removal (#1625)

bcgov · Oct 3, 2024 · 7851a62 · 7851a62
1 parent 38456ec
commit 7851a62
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -148,6 +148,11 @@ jobs:
  # If here skip deployment
  echo "No triggers have fired, deployment skipped"
 
+ - uses: redhat-actions/openshift-tools-installer@v1
+ if: ${{ steps.triggers.outputs.triggered == 'true' }}
+ with:
+ oc: "4"
+
  - name: Deploy if Triggers Fired
  if: ${{ steps.triggers.outputs.triggered == 'true' }}
  working-directory: ${{ inputs.directory }}

diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml
@@ -12,7 +12,7 @@ concurrency:
 jobs:
  cleanup:
  name: Cleanup OpenShift and/or Promote Images
- uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-close.yml@v0.6.1
+ uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-close.yml@v0.7.1
  secrets:
  oc_namespace: ${{ vars.OC_NAMESPACE }}
  oc_token: ${{ secrets.OC_TOKEN }}

diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
@@ -80,6 +80,10 @@ jobs:
  runs-on: ubuntu-latest
  timeout-minutes: 10
  steps:
+ - uses: redhat-actions/openshift-tools-installer@v1
+ with:
+ oc: "4"
+
  - name: Clean up Helm Releases
  run: |
  # Clean up Helm Releases