Skip to content

Commit

Permalink
Merge branch 'main' into renovate/major-github-actions-all
Browse files Browse the repository at this point in the history
  • Loading branch information
paulushcgcj authored Oct 2, 2024
2 parents f6ea7bb + 4987ca2 commit 91c2aa9
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/pr-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ jobs:
runs-on: ubuntu-24.04
timeout-minutes: 10
steps:
- name: Install CLI tools from OpenShift Mirror
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4"

- name: Remove OpenShift artifacts
run: |
oc login --token=${{ secrets.OC_TOKEN }} --server=${{ vars.OC_SERVER }}
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Deploy a single template. Multiple GitHub secrets are used.
```yaml
deploys:
name: Deploys
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Deploys
uses: bcgov-nr/action-deployer-openshift.yml@main
Expand All @@ -126,7 +126,7 @@ Deploy multiple templates in parallel. Runs on pull requests (PRs).
```yaml
deploys:
name: Deploys
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
matrix:
name: [backend, database, frontend, init]
Expand Down Expand Up @@ -170,7 +170,7 @@ Deploy and run a command (post hook). Matrix values reference `post_rollout`, `
```yaml
deploys:
name: Deploys
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
matrix:
name: [database, frontend]
Expand Down Expand Up @@ -205,7 +205,7 @@ Deploy a template and set the after deployment check to hit the **/health** endp
```yaml
deploys:
name: Deploys
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Deploys
uses: bcgov-nr/action-deployer-openshift.yml@main
Expand Down
4 changes: 1 addition & 3 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,8 @@ runs:
# Override OpenShift version, if specified
- name: Install CLI tools from OpenShift Mirror
uses: redhat-actions/openshift-tools-installer@v1
with:
kam: "latest"
with:
oc: ${{ inputs.oc_version || '4' }}
odo: "3.9"

# Process variables and inputs
# Remote/override repo is required if one has been specified (input)
Expand Down

0 comments on commit 91c2aa9

Please sign in to comment.