Merge remote-tracking branch 'os/develop' into merge_os_to_saas

virtualidentityag · Dec 19, 2022 · 6e69b12 · 6e69b12
2 parents 7f3b44e + c469552
commit 6e69b12
Show file tree

Hide file tree

Showing 3 changed files with 5 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,10 +3,9 @@ name: Feature Branch
 on:
   push:
     branches-ignore:
-      - "master"
-      - "staging"
       - "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:
-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 @@