Merge branch 'develop' into feature/carma-cloud-integration

usdot-fhwa-stol · May 1, 2024 · 4c0f71e · 4c0f71e
2 parents 4589f1d + f51f820
commit 4c0f71e
Show file tree

Hide file tree

Showing 12 changed files with 268 additions and 309 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,7 +3,10 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
   push:
-    branches: [develop, master]
+    branches:
+      - develop
+      - master
+      - "release/*"
 jobs:          
   sonar: # sonar job is to setup and run sonar scan analysis on telematic cloud messaging code
     runs-on: ubuntu-latest  

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -5,4 +5,4 @@ on:
 
 jobs:
   docker:
-    uses: usdot-fhwa-stol/actions/.github/workflows/docker.yml@main
+    uses: usdot-fhwa-stol/actions/.github/workflows/docker.yml@main
diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
@@ -5,6 +5,8 @@ on:
       - "develop"
       - "master"
       - "release/*"
+    tags:
+      - "carma-system-*"
 
 jobs:
   dockerhub: