Merge pull request #557 from bcgov/dev

Dev to main merge 27 Oct
bcgov · Oct 27, 2023 · 78d6d44 · 78d6d44
2 parents bb13d40 + 350c603
commit 78d6d44
Show file tree

Hide file tree

Showing 97 changed files with 172,614 additions and 39,019 deletions.
diff --git a/.github/workflows/cd-forms-flow-bpm.yaml b/.github/workflows/cd-forms-flow-bpm.yaml
@@ -11,10 +11,12 @@ on:
  branches:
  - dev
  - main
- - feat/task-228 # Remove in future, just to verify this works
+ - ss-60-github-actions-bug #test auto trigger issue#test1
  paths:
- - "forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm"
- - ".github/workflows/cd-forms-flow-bpm.yaml"
+ - 'backend/**'
+ - 'frontend/**'
+ - 'forms-flow-ai/**'
+ - '.github/workflows/**'
 
 defaults:
  run:

diff --git a/.github/workflows/cd-forms-flow-nav.yaml b/.github/workflows/cd-forms-flow-nav.yaml
@@ -1,4 +1,4 @@
-name: forms-flow-web Custom
+name: forms-flow-nav Custom
 
 on:
  workflow_dispatch:
@@ -11,10 +11,12 @@ on:
  branches:
  - dev
  - main
- - epdds-270 # Remove in future, just to verify this works
+
  paths:
- - "forms-flow-ai/forms-flow-ai-micro-front-ends/forms-flow-nav"
- - ".github/workflows/cd-forms-flow-nav.yaml"
+ - 'backend/**'
+ - 'frontend/**'
+ - 'forms-flow-ai/**'
+ - '.github/workflows/**'
 
 defaults:
  run:

diff --git a/.github/workflows/cd-forms-flow-theme.yaml b/.github/workflows/cd-forms-flow-theme.yaml
@@ -1,4 +1,4 @@
-name: forms-flow-web Custom
+name: forms-flow-web-theme Custom
 
 on:
  workflow_dispatch:
@@ -11,10 +11,12 @@ on:
  branches:
  - dev
  - main
- - epdds-270 # Remove in future, just to verify this works
+
  paths:
- - "forms-flow-ai/forms-flow-ai-micro-front-ends/forms-flow-theme"
- - ".github/workflows/cd-forms-flow-theme.yaml"
+ - 'backend/**'
+ - 'frontend/**'
+ - 'forms-flow-ai/**'
+ - '.github/workflows/**'
 
 defaults:
  run:

diff --git a/.github/workflows/cd-forms-flow-web-ee.yaml b/.github/workflows/cd-forms-flow-web-ee.yaml
@@ -1,4 +1,4 @@
-name: forms-flow-web Custom
+name: forms-flow-web-ee Custom
 
 on:
  workflow_dispatch:
@@ -11,10 +11,12 @@ on:
  branches:
  - dev
  - main
- - epdds-270 # Remove in future, just to verify this works
+
  paths:
- - "forms-flow-ai/forms-flow-ai-ee/forms-flow-web"
- - ".github/workflows/cd-forms-flow-web-ee.yaml"
+ - 'backend/**'
+ - 'frontend/**'
+ - 'forms-flow-ai/**'
+ - '.github/workflows/**'
 
 defaults:
  run:

diff --git a/.github/workflows/cd-forms-flow-web-root-config.yaml b/.github/workflows/cd-forms-flow-web-root-config.yaml
@@ -1,4 +1,4 @@
-name: forms-flow-web Custom
+name: forms-flow-web-root-config Custom
 
 on:
  workflow_dispatch:
@@ -11,11 +11,12 @@ on:
  branches:
  - dev
  - main
- - epdds-270 # Remove in future, just to verify this works
- - epdds-270-fix # Remove in future, just to verify this works
+
  paths:
- - "forms-flow-ai/forms-flow-ai-ee/forms-flow-web-root-config"
- - ".github/workflows/cd-forms-flow-web-root-config.yaml"
+ - 'backend/**'
+ - 'frontend/**'
+ - 'forms-flow-ai/**'
+ - '.github/workflows/**'
 
 defaults:
  run:

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -87,11 +87,10 @@ jobs:
  -Dsonar.cobertura.reportPaths=backend/coverage/cobertura-coverage.xml,frontend/coverage/cobertura-coverage.xml
  -Dsonar.project.monorepo.enabled=true
  -Dsonar.projectKey=${{ github.event.repository.name }}
- -Dsonar.sources=backend/applications/src/,backend/gateway/src/,backend/users/src/,frontend/src/
- -Dsonar.tests=backend/applications/src/,backend/gateway/src/,backend/users/src/
+ -Dsonar.sources=backend/applications/src/,backend/gateway/src/,backend/users/src/,frontend/src/,.github/workflows/,forms-flow-ai/epd-forms/,forms-flow-ai/forms-flow-ai-ee/,forms-flow-ai/forms-flow-ai-micro-front-ends/,map-package/src/
+ -Dsonar.tests=backend/applications/src/,backend/gateway/src/,backend/users/src/,forms-flow-ai/epd-forms/,forms-flow-ai/forms-flow-ai-ee/,forms-flow-ai/forms-flow-ai-micro-front-ends/,.github/workflows/,map-package/src/
  -Dsonar.test.inclusions=backend/applications/src/*.spec.ts,backend/gateway/src/*.spec.ts,backend/users/src/*.spec.ts,backend/applications/src/**/*.spec.ts,backend/gateway/src/**/*.spec.ts,backend/users/src/**/*.spec.ts
- 
- 
+ 
  # deploys:
  # name: Deploys
  # needs:

diff --git a/.gitignore b/.gitignore
@@ -125,4 +125,6 @@ backend/etl/debezium-jdbc/target/
 notes/
 
 forms-flow-ai/forms-flow-bpm/postgres/
-forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/postgres/
+forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/postgres/
+forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/id_rsa_epd
+forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/id_rsa_epd.pub