From 5ee2e9e316e9d2b2ca95bc0247708bfa2358b406 Mon Sep 17 00:00:00 2001 From: Paulo Gomes da Cruz Junior Date: Fri, 27 Sep 2024 11:53:51 -0700 Subject: [PATCH] chore(deps): updating ci dependencies (#285) Co-authored-by: Derek Roberts --- .github/workflows/api-check.yml | 2 +- .github/workflows/merge-main.yml | 24 ++++++++++++++---------- .github/workflows/pr-close.yml | 8 ++++++-- .github/workflows/pr-open.yml | 16 +++++++++------- .github/workflows/scheduled.yml | 2 +- .github/workflows/unit-tests.yml | 4 ++-- 6 files changed, 33 insertions(+), 23 deletions(-) diff --git a/.github/workflows/api-check.yml b/.github/workflows/api-check.yml index 9f5952d6..5aafa482 100644 --- a/.github/workflows/api-check.yml +++ b/.github/workflows/api-check.yml @@ -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 ] diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml index 8f4f004e..14939b0b 100644 --- a/.github/workflows/merge-main.yml +++ b/.github/workflows/merge-main.yml @@ -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 @@ -42,7 +42,7 @@ jobs: codeql: name: Semantic Code Analysis - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: - tests-backend permissions: @@ -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 }} @@ -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 }} @@ -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 }} @@ -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 }} diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml index 42162766..312bd66c 100644 --- a/.github/workflows/pr-close.yml +++ b/.github/workflows/pr-close.yml @@ -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 }} @@ -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: diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml index a26ca924..e84faa08 100644 --- a/.github/workflows/pr-open.yml +++ b/.github/workflows/pr-open.yml @@ -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 @@ -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: @@ -92,7 +92,7 @@ jobs: builds: name: Image Build - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 permissions: packages: write steps: @@ -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 }} @@ -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 }} diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 9d976da8..58892988 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -10,7 +10,7 @@ concurrency: jobs: zap_scan: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 name: Penetration Tests steps: - name: ZAP Scan diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 1ba8f5d0..fca67389 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -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 @@ -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