Update all_solutions.yml (#1195)

* Update all_solutions.yml * Apply suggestions from code review Co-authored-by: Alex Hemsath <[email protected]> * Fix agent version logic Co-authored-by: Josh Coleman <[email protected]> Co-authored-by: Alex Hemsath <[email protected]>
newrelic · Jul 19, 2022 · 292d09d · 292d09d
1 parent 70fc4d4
commit 292d09d
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/.github/workflows/all_solutions.yml b/.github/workflows/all_solutions.yml
@@ -824,6 +824,15 @@ jobs:
       - name: Build RPM
         run: |
           agentVersion=${{ needs.build-test-fullagent-msi.outputs.agentVersion }}
+          
+          if [[ "$agentVersion" =~ [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+ ]]; then
+            major=$(echo $agentVersion | cut -d'.' -f1)
+            minor=$(echo $agentVersion | cut -d'.' -f2)
+            patch=$(echo $agentVersion | cut -d'.' -f3)
+            agentVersion="${major}.${minor}.${patch}"
+            echo "agentVersion is simplified to $agentVersion"
+          fi
+          
           cd ${{ github.workspace }}/build/Linux
           docker-compose build build_rpm
           docker-compose run -e AGENT_VERSION=$agentVersion -e GPG_KEYS=/keys/gpg.tar.bz2 build_rpm
@@ -863,6 +872,15 @@ jobs:
       - name: Build Debian Package
         run: |
           agentVersion=${{ needs.build-test-fullagent-msi.outputs.agentVersion }}
+          
+          if [[ "$agentVersion" =~ [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+ ]]; then
+            major=$(echo $agentVersion | cut -d'.' -f1)
+            minor=$(echo $agentVersion | cut -d'.' -f2)
+            patch=$(echo $agentVersion | cut -d'.' -f3)
+            agentVersion="${major}.${minor}.${patch}"
+            echo "agentVersion is simplified to $agentVersion"
+          fi
+          
           cd ${{ github.workspace }}/build/Linux
           docker-compose build build_deb
           docker-compose run -e AGENT_VERSION=$agentVersion build_deb