Skip to content

Commit

Permalink
Merge branch 'main' into renovate/registry.access.redhat.com-ubi9-s2i…
Browse files Browse the repository at this point in the history
…-base
  • Loading branch information
rafasdc authored Nov 16, 2024
2 parents f249a05 + 0ccffb0 commit 77d3ee2
Show file tree
Hide file tree
Showing 9 changed files with 638 additions and 1,094 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,22 @@ jobs:
clean-dev-env:
uses: ./.github/workflows/clean-dev-env-jobs.yaml
secrets: inherit
setup-s3-backup:
uses: ./.github/workflows/s3-backup.yaml
secrets:
AWS_ARN_DEV: ${{ secrets.AWS_ARN_DEV }}
OPENSHIFT_TOKEN_DEV: ${{ secrets.OPENSHIFT_TOKEN_DEV }}
OPENSHIFT_APP_NAMESPACE_DEV: ${{ secrets.OPENSHIFT_APP_NAMESPACE_DEV }}
AWS_PARAM_DEV: ${{ secrets.AWS_PARAM_DEV }}
AWS_ARN_TEST: ${{ secrets.AWS_ARN_TEST }}
OPENSHIFT_TOKEN_TEST: ${{ secrets.OPENSHIFT_TOKEN_TEST }}
OPENSHIFT_APP_NAMESPACE_TEST: ${{ secrets.OPENSHIFT_APP_NAMESPACE_TEST }}
AWS_ARN_PROD: ${{ secrets.AWS_ARN_PROD }}
AWS_PARAM_TEST: ${{ secrets.AWS_PARAM_TEST }}
OPENSHIFT_TOKEN_PROD: ${{ secrets.OPENSHIFT_TOKEN_PROD }}
OPENSHIFT_APP_NAMESPACE_PROD: ${{ secrets.OPENSHIFT_APP_NAMESPACE_PROD }}
AWS_PARAM_PROD: ${{ secrets.AWS_PARAM_PROD }}
OPENSHIFT_SERVER: ${{ secrets.OPENSHIFT_SERVER }}
# Temp disable nightly main workflow
# main:
# needs: [clear-cache]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
if: github.event_name == 'pull_request'
run: git checkout "$GITHUB_BASE_REF" && git tag latest && git checkout "$GITHUB_HEAD_REF"
- name: Conventional commits check
uses: cocogitto/cocogitto-action@v3.8
uses: cocogitto/cocogitto-action@v3.9
with:
check-latest-tag-only: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-containers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Self-hosted Renovate
uses: renovatebot/github-action@v40.3.5
uses: renovatebot/github-action@v41.0.2
with:
configurationFile: ./.github/renovate.json
token: ${{ secrets.RENOVATE_GITHUB_TOKEN }}
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## [1.207.2](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.207.1...v1.207.2) (2024-11-15)

## [1.207.1](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.207.0...v1.207.1) (2024-11-15)

# [1.207.0](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.206.1...v1.207.0) (2024-11-13)
Expand Down
4 changes: 2 additions & 2 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"dependencies": {
"@aws-sdk/client-s3": "^3.629.0",
"@aws-sdk/client-sns": "^3.245.0",
"@aws-sdk/client-sns": "^3.693.0",
"@aws-sdk/credential-providers": "^3.682.0",
"@aws-sdk/lib-storage": "^3.617.0",
"@aws-sdk/middleware-apply-body-checksum": "^3.374.0",
Expand All @@ -38,7 +38,7 @@
"@button-inc/bcgov-theme": "^1.0.1",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.11.5",
"@fortawesome/fontawesome-svg-core": "^6.2.0",
"@fortawesome/fontawesome-svg-core": "^6.6.0",
"@fortawesome/free-solid-svg-icons": "^6.2.0",
"@fortawesome/react-fontawesome": "^0.2.2",
"@graphile-contrib/pg-many-to-many": "^1.0.1",
Expand Down
Loading

0 comments on commit 77d3ee2

Please sign in to comment.