Skip to content

Commit

Permalink
Merge branch 'main' into chore/tbdBreak
Browse files Browse the repository at this point in the history
  • Loading branch information
DerekRoberts authored Oct 15, 2024
2 parents 12b4ce0 + 67321ea commit 3291319
Show file tree
Hide file tree
Showing 18 changed files with 336 additions and 1,064 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/.deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,13 @@ jobs:
name: Helm
if: ${{ inputs.build_outputs != '' }}
environment: ${{ inputs.environment }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: ${{ inputs.timeout-minutes }}
steps:
- uses: actions/checkout@v4
- uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"
- name: Deploy
working-directory: ${{ inputs.directory }}
shell: bash
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ jobs:
trivy:
name: Trivy Security Scan
if: github.event_name != 'pull_request' || !github.event.pull_request.draft
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4

- name: Run Trivy vulnerability scanner in repo mode
uses: aquasecurity/trivy-action@0.24.0
uses: aquasecurity/trivy-action@0.27.0
with:
format: "sarif"
output: "trivy-results.sarif"
Expand All @@ -40,7 +40,7 @@ jobs:
java:
name: Java
if: github.event_name != 'pull_request' || !github.event.pull_request.draft
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
defaults:
run:
working-directory: backend-java
Expand All @@ -63,7 +63,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: "21"
java-version: "23"
- name: Cache local Maven repository
uses: actions/cache@v4
with:
Expand All @@ -78,7 +78,7 @@ jobs:
python:
name: Python
if: github.event_name != 'pull_request' || !github.event.pull_request.draft
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
defaults:
run:
working-directory: backend-py
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
name: Analysis Results
needs: [trivy, java, python]
if: always()
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- if: contains(needs.*.result, 'failure')
run: echo "At least one job has failed." && exit 1
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
name: Set Variables
outputs:
pr: ${{ steps.pr.outputs.pr }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 1
steps: # Get PR number for squash merges to main
- name: PR Number
Expand All @@ -46,7 +46,7 @@ jobs:
defaults:
run:
working-directory: integration-tests
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
matrix:
name: [quarkus, fiber, fastapi]
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
promote:
name: Promote Images
needs: [deploy-prod, vars]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
permissions:
packages: write
strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pentests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
name: [backendGo, backendJava, backendPy]
steps:
- name: ZAP Scan
uses: zaproxy/action-full-scan@v0.10.0
uses: zaproxy/action-full-scan@v0.11.0
with:
allow_issue_writing: true
artifact_name: "zap_${{ matrix.name }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-close.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ concurrency:
jobs:
cleanup:
name: Cleanup OpenShift and/or Promote Images
uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-close.yml@v0.7.0
uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-close.yml@v0.8.1
secrets:
oc_namespace: ${{ vars.OC_NAMESPACE }}
oc_token: ${{ secrets.OC_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-open.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
packages: write
outputs:
digest: ${{ steps.builds.outputs.digest }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
matrix:
package: [ backend-go, backend-java, backend-py, migrations-go, migrations-py]
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
name: PR Results
needs: [builds, deploys]
if: always()
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- if: contains(needs.*.result, 'failure')
run: echo "At least one job has failed." && exit 1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ concurrency:
jobs:
validate:
name: Validate PR
uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-validate.yml@v0.7.0
uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-validate.yml@v0.8.1
with:
markdown_links: |
- [Java](https://${{ github.event.repository.name }}-${{ github.event.number }}-backendJava.apps.silver.devops.gov.bc.ca)
Expand All @@ -22,6 +22,6 @@ jobs:
name: Validate Results
if: always()
needs: [validate]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- run: echo "Success!"
2 changes: 1 addition & 1 deletion backend-go/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/bcgov/quickstart-openshift-backends/backend-go

go 1.22.0

toolchain go1.23.1
toolchain go1.23.2

require (
github.com/devfeel/mapper v0.7.14
Expand Down
Loading

0 comments on commit 3291319

Please sign in to comment.