Skip to content

Commit

Permalink
fix: Fix pr number in hotfix round2 (#547)
Browse files Browse the repository at this point in the history
  • Loading branch information
barrfalk authored Jul 19, 2024
1 parent a1f1e58 commit 0e6a2f4
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 1 deletion.
67 changes: 67 additions & 0 deletions .github/workflows/merge-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
name: Merge to Release

on:
push:
branches: [release/*]
paths-ignore:
- "*.md"
- ".github/**"
- ".github/graphics/**"
- "!.github/workflows/**"
workflow_dispatch:
inputs:
pr_no:
description: "PR-numbered container set to deploy"
type: number
required: true

concurrency:
# Do not interrupt previous workflows
group: ${{ github.workflow }}
cancel-in-progress: false

jobs:
vars:
name: Set Variables
outputs:
pr: ${{ steps.pr.outputs.pr }}
runs-on: ubuntu-22.04
timeout-minutes: 1
steps:
- uses: actions/checkout@v4
# Get PR number for squash merges to release
- name: PR Number
id: pr
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-test:
name: Deploy (test)
needs: vars
uses: bcgov/quickstart-openshift-helpers/.github/workflows/[email protected]
secrets:
oc_namespace: ${{ secrets.OC_NAMESPACE }}
oc_token: ${{ secrets.OC_TOKEN }}
with:
environment: test
tag: ${{ needs.vars.outputs.pr }}

promote:
name: Promote Images
needs: [deploy-test, vars]
runs-on: ubuntu-22.04
permissions:
packages: write
strategy:
matrix:
package: [migrations, backend, frontend, webeoc]
timeout-minutes: 1
steps:
- uses: shrink/actions-docker-registry-tag@v4
with:
registry: ghcr.io
repository: ${{ github.repository }}/${{ matrix.package }}
target: ${{ needs.vars.outputs.pr }}
tags: test
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 Container");
console.log("Starting WebEOC Container...");
dotenv.config();
const server = express();
server.disable("x-powered-by");
Expand Down

0 comments on commit 0e6a2f4

Please sign in to comment.