Skip to content

Commit

Permalink
fix: applying PR fix to hotfix action (#545)
Browse files Browse the repository at this point in the history
  • Loading branch information
barrfalk authored Jul 19, 2024
1 parent ea09a41 commit edbdd69
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
npm ci
npm run test:cov
dir: ${{ matrix.dir }}
node_version: "22"
node_version: "20"
sonar_args: >
-Dsonar.exclusions=**/coverage/**,**/node_modules/**,**/*spec.ts
-Dsonar.organization=bcgov-sonarcloud
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/merge-hotfix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,25 @@ jobs:
runs-on: ubuntu-22.04
timeout-minutes: 1
steps:
# Get PR number for squash merges to main
- uses: actions/checkout@v4
# Get PR number for squash merges to release
- name: PR Number
id: pr
uses: bcgov-nr/[email protected]
uses: ./.github/actions/get-pr-number
- name: Set PR Output
run: echo "pr=${{ steps.pr.outputs.pr }}" >> $GITHUB_OUTPUT

# https://github.com/bcgov/quickstart-openshift-helpers
deploy-hotfix:
name: Deploy (hotfix)
needs: vars
uses: bcgov/quickstart-openshift-helpers/.github/workflows/[email protected]
secrets:
oc_namespace: ${{ secrets.OC_NAMESPACE }}
oc_token: ${{ secrets.OC_TOKEN }}
with:
environment: hotfix
tag: ${{ needs.vars.outputs.pr }}

promote:
name: Promote Images
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 @@ -18,4 +18,4 @@ jobs:
oc_token: ${{ secrets.OC_TOKEN }}
with:
cleanup: helm
packages: backend frontend migrations
packages: backend frontend migrations webeoc
2 changes: 1 addition & 1 deletion webeoc/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { ExpressAdapter } from "@nestjs/platform-express";

async function bootstrap() {
process.env.TZ = "UTC"; // this application runs on UTC time in OpenShift, so let's do the same locally as well. Useful to test polling periods.
console.log("Starting WebEOC Connection Container");
console.log("Starting WebEOC Container");
dotenv.config();
const server = express();
server.disable("x-powered-by");
Expand Down

0 comments on commit edbdd69

Please sign in to comment.