Merge branch 'release-5.0.0' of https://github.com/samagra-comms/dao …

…into v2-integration
samagra-comms · Aug 24, 2022 · 8c8c72f · 8c8c72f
2 parents 67952ad + 91d75e0
commit 8c8c72f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml
@@ -5,10 +5,10 @@ on:
     tags:
       - 'v*.*.*'
     branches:
-      ["release-4.9.0", "release-4.10.0", "v2-integration"]
+      ["release-4.9.0", "release-4.10.0", "release-5.0.0", "v2-integration"]
   pull_request:
     branches:
-      ["release-4.9.0", "release-4.10.0", "v2-integration"]
+      ["release-4.9.0", "release-4.10.0", "release-5.0.0", "v2-integration"]
 
 
 jobs:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,10 +3,10 @@ name: Maven Build
 on: 
   push:
     branches:
-      ["release-4.9.0", "release-4.10.0", "v2-integration"]
+      ["release-4.9.0", "release-4.10.0", "release-5.0.0", "v2-integration"]
   pull_request:
     branches:
-      ["release-4.9.0", "release-4.10.0", "v2-integration"]
+      ["release-4.9.0", "release-4.10.0", "release-5.0.0", "v2-integration"]
 
 jobs:
   build:
@@ -52,4 +52,4 @@ jobs:
         env:
           GITHUB_USERNAME: ${{ secrets.USERNAME }}
           GITHUB_TOKEN: ${{ secrets.TOKEN }}
-        run: mvn -s $GITHUB_WORKSPACE/settings.xml clean install -DskipTests
+        run: mvn -s $GITHUB_WORKSPACE/settings.xml clean install -DskipTests