From 7851a62e8c9ec3b855ec88978b2839934f42d868 Mon Sep 17 00:00:00 2001 From: Derek Roberts Date: Thu, 3 Oct 2024 12:35:44 -0700 Subject: [PATCH] chore(ci): handle gh runner oc removal (#1625) --- .github/workflows/deploy.yml | 5 +++++ .github/workflows/pr-close.yml | 2 +- .github/workflows/scheduled.yml | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6f27faab9..8258f496b 100644 --- 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 index 45802f6f9..5b66b040a 100644 --- 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 index 98201e02b..5ee888e79 100644 --- 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