From fa56a009743aeb0efc615d8bc7ca86ea2440b67e Mon Sep 17 00:00:00 2001 From: Derek Roberts Date: Fri, 19 Jan 2024 11:43:56 -0800 Subject: [PATCH 1/2] Update DEMO deployer --- .github/workflows/merge-demo.yml | 7 +++---- .github/workflows/merge-main.yml | 3 +-- .github/workflows/pr-open.yml | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/merge-demo.yml b/.github/workflows/merge-demo.yml index 839cf7a98..60aa7d572 100644 --- a/.github/workflows/merge-demo.yml +++ b/.github/workflows/merge-demo.yml @@ -2,8 +2,7 @@ name: Merge to Demo on: push: - branches: - - demo + # branches: [demo] env: ZONE: demo @@ -43,6 +42,7 @@ jobs: package: ${{ matrix.package }} build_context: ${{ matrix.build_context }} build_file: ${{ matrix.build_file }} + keep_versions: 100 tag: ${{ env.ZONE }} tag_fallback: test token: ${{ secrets.GITHUB_TOKEN }} @@ -52,8 +52,6 @@ jobs: name: DEMO Deploys needs: [builds] environment: test - env: - ZONE: demo runs-on: ubuntu-22.04 timeout-minutes: 10 strategy: @@ -64,6 +62,7 @@ jobs: file: api/openshift.deploy.yml overwrite: true parameters: + -p OC_NAMESPACE=${{ vars.OC_NAMESPACE }} -p URL=fom-demo.apps.silver.devops.gov.bc.ca -p FOM_EMAIL_NOTIFY=FLNR.AdminServicesCariboo@gov.bc.ca -p DB_TESTDATA=true diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml index 6d4aba8a5..3d4fe775c 100644 --- a/.github/workflows/merge-main.yml +++ b/.github/workflows/merge-main.yml @@ -2,8 +2,7 @@ name: Merge to Main on: push: - branches: - - main + branches: [main] paths-ignore: - ".github/ISSUE_TEMPLATE/*" - "**.md" diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml index 112d29375..d673c1064 100644 --- a/.github/workflows/pr-open.yml +++ b/.github/workflows/pr-open.yml @@ -1,7 +1,7 @@ name: Pull Request Open on: - pull_request: + # pull_request: workflow_dispatch: concurrency: From 79a3db2419ef8358887d13d0112b4042ff7835c8 Mon Sep 17 00:00:00 2001 From: Derek Roberts Date: Fri, 19 Jan 2024 12:02:20 -0800 Subject: [PATCH 2/2] Restore workflows --- .github/workflows/merge-demo.yml | 9 +-------- .github/workflows/pr-open.yml | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/merge-demo.yml b/.github/workflows/merge-demo.yml index 60aa7d572..6d340cd03 100644 --- a/.github/workflows/merge-demo.yml +++ b/.github/workflows/merge-demo.yml @@ -2,7 +2,7 @@ name: Merge to Demo on: push: - # branches: [demo] + branches: [demo] env: ZONE: demo @@ -24,17 +24,13 @@ jobs: - package: admin build_context: ./ build_file: admin/Dockerfile - triggers: ('admin/' 'libs/') - package: api build_context: ./ build_file: api/Dockerfile - triggers: ('api/' 'libs/') - package: db - triggers: ('db') - package: public build_context: ./ build_file: public/Dockerfile - triggers: ('public/' 'libs/') steps: - uses: actions/checkout@v4 - uses: bcgov-nr/action-builder-ghcr@v2.0.1 @@ -42,11 +38,8 @@ jobs: package: ${{ matrix.package }} build_context: ${{ matrix.build_context }} build_file: ${{ matrix.build_file }} - keep_versions: 100 tag: ${{ env.ZONE }} - tag_fallback: test token: ${{ secrets.GITHUB_TOKEN }} - triggers: ${{ matrix.triggers }} deploy: name: DEMO Deploys diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml index d673c1064..112d29375 100644 --- a/.github/workflows/pr-open.yml +++ b/.github/workflows/pr-open.yml @@ -1,7 +1,7 @@ name: Pull Request Open on: - # pull_request: + pull_request: workflow_dispatch: concurrency: