Skip to content

Commit

Permalink
chore(deps): updating ci dependencies (#285)
Browse files Browse the repository at this point in the history
Co-authored-by: Derek Roberts <derek.roberts@gmail.com>
  • Loading branch information
paulushcgcj and DerekRoberts authored Sep 27, 2024
1 parent abd1e7f commit 5ee2e9e
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/api-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:
jobs:
verify-api:
name: Verify API Health
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
matrix:
package: [ test, prod ]
Expand Down
24 changes: 14 additions & 10 deletions .github/workflows/merge-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
tests-backend:
name: Backend Unit Tests
if: github.event_name != 'pull_request' || !github.event.pull_request.draft
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
continue-on-error: true
steps:
- name: Run tests
Expand All @@ -42,7 +42,7 @@ jobs:

codeql:
name: Semantic Code Analysis
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- tests-backend
permissions:
Expand Down Expand Up @@ -74,16 +74,17 @@ jobs:
env:
ZONE: test
environment: test
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Deploys
uses: bcgov-nr/action-deployer-openshift@v3.0.0
uses: bcgov-nr/action-deployer-openshift@v3.0.1
with:
file: .github/openshift/deploy.database.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
oc_server: ${{ secrets.OC_SERVER }}
oc_token: ${{ secrets.OC_TOKEN }}
oc_version: "4.13"
overwrite: false
parameters: -p ZONE=${{ env.ZONE }} -p NAME=${{ github.event.repository.name }}

Expand All @@ -94,16 +95,17 @@ jobs:
env:
ZONE: test
environment: test
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Deploys
uses: bcgov-nr/action-deployer-openshift@v3.0.0
uses: bcgov-nr/action-deployer-openshift@v3.0.1
with:
file: .github/openshift/deploy.backend.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
oc_server: ${{ secrets.OC_SERVER }}
oc_token: ${{ secrets.OC_TOKEN }}
oc_version: "4.13"
overwrite: true
parameters:
-p ZONE=${{ env.ZONE }} -p NAME=${{ github.event.repository.name }}
Expand All @@ -124,16 +126,17 @@ jobs:
PREV: test
ZONE: prod
environment: prod
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Deploys
uses: bcgov-nr/action-deployer-openshift@v3.0.0
uses: bcgov-nr/action-deployer-openshift@v3.0.1
with:
file: .github/openshift/deploy.database.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
oc_server: ${{ secrets.OC_SERVER }}
oc_token: ${{ secrets.OC_TOKEN }}
oc_version: "4.13"
overwrite: false
parameters: -p ZONE=${{ env.ZONE }} -p NAME=${{ github.event.repository.name }}

Expand All @@ -145,16 +148,17 @@ jobs:
PREV: test
ZONE: prod
environment: prod
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Deploys
uses: bcgov-nr/action-deployer-openshift@v3.0.0
uses: bcgov-nr/action-deployer-openshift@v3.0.1
with:
file: .github/openshift/deploy.backend.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
oc_server: ${{ secrets.OC_SERVER }}
oc_token: ${{ secrets.OC_TOKEN }}
oc_version: "4.13"
overwrite: true
parameters:
-p ZONE=${{ env.ZONE }} -p NAME=${{ github.event.repository.name }}
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/pr-close.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,15 @@ concurrency:
jobs:
cleanup-openshift:
name: Cleanup OpenShift
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
environment:
name: dev
steps:
- uses: actions/checkout@v4
- name: Install CLI tools from OpenShift Mirror
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.13"
- name: Remove OpenShift artifacts
run: |
oc login --token=${{ secrets.OC_TOKEN }} --server=${{ secrets.OC_SERVER }}
Expand All @@ -28,7 +32,7 @@ jobs:
image-promotions:
name: Image Promotions
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main'
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: shrink/actions-docker-registry-tag@v4
with:
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/pr-open.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:
jobs:
pr-validation:
name: Pull Request Validation
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
contents: read
pull-requests: write
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
env:
DOMAIN: apps.silver.devops.gov.bc.ca
PREFIX: ${{ github.event.repository.name }}-${{ github.event.number }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
permissions:
pull-requests: write
steps:
Expand All @@ -92,7 +92,7 @@ jobs:
builds:
name: Image Build
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
permissions:
packages: write
steps:
Expand All @@ -115,16 +115,17 @@ jobs:
needs:
- builds
environment: dev
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Deploys
uses: bcgov-nr/action-deployer-openshift@v3.0.0
uses: bcgov-nr/action-deployer-openshift@v3.0.1
with:
file: .github/openshift/deploy.database.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
oc_server: ${{ secrets.OC_SERVER }}
oc_token: ${{ secrets.OC_TOKEN }}
oc_version: "4.13"
overwrite: false
parameters:
-p ZONE=${{ github.event.number }} -p NAME=${{ github.event.repository.name }}
Expand All @@ -134,17 +135,18 @@ jobs:
needs:
- deploy-database
environment: dev
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4

- name: Deploys
uses: bcgov-nr/action-deployer-openshift@v3.0.0
uses: bcgov-nr/action-deployer-openshift@v3.0.1
with:
file: .github/openshift/deploy.backend.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
oc_server: ${{ secrets.OC_SERVER }}
oc_token: ${{ secrets.OC_TOKEN }}
oc_version: "4.13"
overwrite: true
parameters:
-p ZONE=${{ github.event.number }} -p NAME=${{ github.event.repository.name }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ concurrency:

jobs:
zap_scan:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
name: Penetration Tests
steps:
- name: ZAP Scan
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
name: Backend Unit Tests
if: github.event_name != 'pull_request' || !github.event.pull_request.draft
continue-on-error: true
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Test app
uses: bcgov-nr/action-test-and-analyse@v1.2.1
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
trivy:
name: Repository Report
if: github.event_name != 'pull_request' || !github.event.pull_request.draft
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down

0 comments on commit 5ee2e9e

Please sign in to comment.