From 9164380840d6f8110f25ba92f2d3eade19c93796 Mon Sep 17 00:00:00 2001 From: sggerard Date: Wed, 27 Nov 2024 15:32:55 -0800 Subject: [PATCH 1/4] Update workflow to deploy packages tagged with test --- .github/workflows/deploy.prod.yml | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/deploy.prod.yml b/.github/workflows/deploy.prod.yml index 0768d04..91af698 100644 --- a/.github/workflows/deploy.prod.yml +++ b/.github/workflows/deploy.prod.yml @@ -4,9 +4,10 @@ on: workflow_dispatch: inputs: pr_no: - description: "PR-numbered container set to deploy" + description: "PR or tag to deploy (default = 'test')" type: number required: false + default: "test" concurrency: # Do not interrupt previous workflows @@ -14,25 +15,13 @@ concurrency: cancel-in-progress: false jobs: - vars: - name: Set Variables - outputs: - pr: ${{ steps.pr.outputs.pr }} - runs-on: ubuntu-24.04 - timeout-minutes: 1 - steps: - # Get PR number for squash merges to main - - name: PR Number - id: pr - uses: bcgov-nr/action-get-pr@v0.0.1 - deploy-prod: name: Deploy (prod) - needs: [vars] uses: ./.github/workflows/.deployer.yml secrets: inherit with: environment: prod + tag: ${{ inputs.pr_no}} params: --set cms.deploymentStrategy=RollingUpdate --set frontend.deploymentStrategy=RollingUpdate @@ -43,7 +32,7 @@ jobs: --set frontend.replicaCount=2 promote: name: Promote Images - needs: [deploy-prod, vars] + needs: [deploy-prod] runs-on: ubuntu-24.04 permissions: packages: write @@ -56,5 +45,5 @@ jobs: with: registry: ghcr.io repository: ${{ github.repository }}/${{ matrix.package }} - target: ${{ needs.vars.outputs.pr }} + target: ${{ inputs.pr_no }} tags: prod From ba5834d41acfad06854d66f51c2c5198a1600368 Mon Sep 17 00:00:00 2001 From: sggerard Date: Tue, 3 Dec 2024 15:57:28 -0800 Subject: [PATCH 2/4] Fix bootstrap accordians, fix footer scss rule --- ...ative-penalties-tab-content.component.html | 4 +- ...ce-prosecutions-tab-content.component.html | 4 +- frontend/src/app/footer/footer.component.scss | 6 +- .../authorizations-tab-content.component.html | 2 +- .../compliance-tab-content.component.html | 2 +- .../documents-tab-content.component.html | 2 +- .../project-list/project-list.component.html | 2 +- frontend/src/assets/styles/footer.scss | 192 ------------------ 8 files changed, 12 insertions(+), 202 deletions(-) delete mode 100644 frontend/src/assets/styles/footer.scss diff --git a/frontend/src/app/enforcement-actions/administrative-penalties-tab-content/administrative-penalties-tab-content.component.html b/frontend/src/app/enforcement-actions/administrative-penalties-tab-content/administrative-penalties-tab-content.component.html index 4565bef..2eef006 100644 --- a/frontend/src/app/enforcement-actions/administrative-penalties-tab-content/administrative-penalties-tab-content.component.html +++ b/frontend/src/app/enforcement-actions/administrative-penalties-tab-content/administrative-penalties-tab-content.component.html @@ -23,14 +23,14 @@