Merge pull request #71 from virtualidentityag/merge_os_to_saas

Merge os to saas
virtualidentityag · Dec 19, 2022 · 58b0253 · 58b0253
2 parents efa9e7b + 4ba627c
commit 58b0253
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/dockerImage.yml b/.github/workflows/dockerImage.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - "develop"
+      - "staging"
+      - "release"
       - "tsys-release"
     tags:
       - "dockerImage.v.*"

diff --git a/.github/workflows/feature-branch.yml b/.github/workflows/feature-branch.yml
@@ -3,9 +3,9 @@ name: Feature Branch
 on:
   push:
     branches-ignore:
-      - "master"
       - "develop"
-
+      - "staging"
+      - "release"
 jobs:
   test:
     name: Build and run unit tests

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,7 +3,7 @@ name: Release action
 on:
   push:
     branches:
-      - release**
+      - 'release'
 
 jobs:
   build:

diff --git a/.github/workflows/securityScan.yml b/.github/workflows/securityScan.yml
@@ -3,6 +3,8 @@ on:
   push:
     branches:
       - 'develop'
+      - 'staging'
+      - 'release'
   pull_request:
 jobs:
   build:
@@ -18,4 +20,4 @@ jobs:
           scan-ref: '.'
           format: 'table'
           exit-code: 1
-          severity: CRITICAL
+          severity: CRITICAL
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Release action @@
     on:
       push:
         branches:
-          - release**
+          - 'release'
     jobs:
       build:
@@ Expand Down @@