Merge pull request #276 from bcgov/updated-git-actions

updated actions with new appropriate branches
bcgov · Oct 30, 2023 · 2e95f58 · 2e95f58
2 parents cd4514e + 79bb92e
commit 2e95f58
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 17 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,12 +3,12 @@ updates:
   # NuGet dependencies
   - package-ecosystem: "nuget"
     directory: "/dfa/src/API"
-    target-branch: "feature/dfa_cleanup"
+    target-branch: "develop"
     schedule:
       interval: "daily"
   # npm dependencies - frontend
   - package-ecosystem: "npm"
     directory: "/dfa/src/UI"
-    target-branch: "feature/dfa_cleanup"
+    target-branch: "develop"
     schedule:
       interval: "daily"
diff --git a/.github/workflows/cd-dfa-landing-page-project.yml b/.github/workflows/cd-dfa-landing-page-project.yml
@@ -4,8 +4,7 @@ name: cd-dfa-landing-page-project
 on:
   push:
     branches:
-      #- master
-      - feature/dfa_cleanup
+      - develop
 
     paths:
       - "landing-page/**"

diff --git a/.github/workflows/cd-dfa-landing-page-support.yml b/.github/workflows/cd-dfa-landing-page-support.yml
@@ -4,8 +4,7 @@ name: cd-dfa-landing-page-support
 on:
   push:
     branches:
-      #- master
-      - feature/dfa_cleanup
+      - support-develop
 
     paths:
       - "landing-page/**"

diff --git a/.github/workflows/cd-dfa-portal-project-api.yml b/.github/workflows/cd-dfa-portal-project-api.yml
@@ -4,8 +4,7 @@ name: cd-dfa-portal-project-api
 on:
   push:
     branches:
-      #- master
-      - feature/dfa_cleanup
+      - develop
 
     paths:
       - "dfa/src/API/**"

diff --git a/.github/workflows/cd-dfa-portal-project-ui.yml b/.github/workflows/cd-dfa-portal-project-ui.yml
@@ -4,8 +4,7 @@ name: cd-dfa-portal-project-ui
 on:
   push:
     branches:
-      #- master
-      - feature/dfa_cleanup
+      - develop
 
     paths:
       - "dfa/src/UI/**"

diff --git a/.github/workflows/cd-dfa-portal-support-api.yml b/.github/workflows/cd-dfa-portal-support-api.yml
@@ -2,7 +2,13 @@
 name: cd-dfa-portal-support-api
 
 on:
-  workflow_dispatch: {}
+  push:
+    branches:
+      - support-develop
+
+    paths:
+      - "dfa/src/API/**"
+      - ".github/workflows/cd-dfa-portal-project-api.yml"
 
 env:
   IMAGE_NAME: dfa-portal-api

diff --git a/.github/workflows/cd-dfa-portal-support-ui.yml b/.github/workflows/cd-dfa-portal-support-ui.yml
@@ -2,7 +2,13 @@
 name: cd-dfa-portal-support-ui
 
 on:
-  workflow_dispatch: {}
+  push:
+    branches:
+      - support-develop
+
+    paths:
+      - "dfa/src/UI/**"
+      - ".github/workflows/cd-dfa-portal-project-ui.yml"
 
 env:
   IMAGE_NAME: dfa-portal-ui

diff --git a/.github/workflows/cd-oauth-server-project.yml b/.github/workflows/cd-oauth-server-project.yml
@@ -4,8 +4,7 @@ on:
   workflow_dispatch: {}
   push:
     branches:
-      #- master
-      - feature/dfa_cleanup
+      - develop
 
     paths:
       - "oauth-server/src/API/**"

diff --git a/.github/workflows/cd-oauth-server-support.yml b/.github/workflows/cd-oauth-server-support.yml
@@ -2,6 +2,13 @@ name: cd-oauth-server-support
 
 on:
   workflow_dispatch: {}
+  push:
+    branches:
+      - support-develop
+
+    paths:
+      - "oauth-server/src/API/**"
+      - ".github/workflows/cd-oauth-server-project.yml"
 
 env:
   IMAGE_NAME: oauth-server

diff --git a/.github/workflows/zap-scan-config.yml b/.github/workflows/zap-scan-config.yml
@@ -2,8 +2,7 @@ name: ZAP Scan
 on:
   push:
     branches:
-      #- master
-      - feature/dfa_cleanup
+      - develop
 
     paths:
       - ".github/workflows/zap-scan-config.yml"
@@ -19,5 +18,5 @@ jobs:
       - name: ZAP Scan
         uses: zaproxy/action-baseline@v0.6.1
         with:
-          target: 'https://era-dfa-dev.apps.silver.devops.gov.bc.ca/'
+          target: 'https://portal.dev.dfa.gov.bc.ca'
           token: ${{ secrets.GITHUB_TOKEN }}