fix(ci): DEMO workflow (#570)

.github/workflows/merge-demo.yml

@@ -2,8 +2,7 @@ name: Merge to Demo
 
 on:
   push:
-    branches:
-      - demo
+    branches: [demo]
 
 env:
   ZONE: demo
@@ -25,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/[email protected]
@@ -44,16 +39,12 @@ jobs:
           build_context: ${{ matrix.build_context }}
           build_file: ${{ matrix.build_file }}
           tag: ${{ env.ZONE }}
-          tag_fallback: test
           token: ${{ secrets.GITHUB_TOKEN }}
-          triggers: ${{ matrix.triggers }}
 
   deploy:
     name: DEMO Deploys
     needs: [builds]
     environment: test
-    env:
-      ZONE: demo
     runs-on: ubuntu-22.04
     timeout-minutes: 10
     strategy:
@@ -64,6 +55,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 [email protected]
               -p DB_TESTDATA=true

.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"