Merge pull request #25 from virtualidentityag/merge_os_to_saas

Merge os to saas
virtualidentityag · Dec 19, 2022 · c53052e · c53052e
2 parents 6e9ba8b + 0987305
commit c53052e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/dockerImage.yml b/.github/workflows/dockerImage.yml
@@ -3,8 +3,10 @@ name: Publish Docker image
 on:
   push:
     branches:
-      - "develop"
-      - "tsys-release"
+      - 'release'
+      - 'staging'
+      - 'develop'
+      - 'tsys-release'
     tags:
       - "dockerImage.v.*"
       - "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"
-      - "staging"
-      - "develop"
+      - 'release'
+      - 'staging'
+      - 'develop'
 
 jobs:
   test:

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

diff --git a/.github/workflows/securityScan.yml b/.github/workflows/securityScan.yml
@@ -3,7 +3,6 @@ on:
   push:
     branches:
       - '*'
-      - '*'
   pull_request:
 jobs:
   build:
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ on: @@
       push:
         branches:
           - '*'
-          - '*'
       pull_request:
     jobs:
       build:
@@ Expand Down @@