Make version use sha

NationalSecurityAgency · Sep 27, 2024 · f5a8380 · f5a8380
1 parent 7d34b39
commit f5a8380
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/build-accumulo.yml b/.github/workflows/build-accumulo.yml
@@ -56,10 +56,10 @@ jobs:
       id: build-accumulo
       run: |
         cd $GITHUB_WORKSPACE/accumulo
-        export NEWVERSION=$(mvn help:evaluate -Dexpression=project.version.major -q -DforceStdout).$(mvn help:evaluate -Dexpression=project.version.minor -q -DforceStdout).$(mvn help:evaluate -Dexpression=project.version.incremental -q -DforceStdout)-$(git rev-parse --short HEAD)
+        mvn build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.incrementalVersion}-$(git rev-parse --short HEAD)
+        export NEWVERSION=$(mvn -q help:evaluate -DforceStdout -Dexpression=project.version)
         echo accumuloversion=$NEWVERSION >> $GITHUB_OUTPUT
         echo $NEWVERSION
-        mvn versions:set -DnewVersion=$NEWVERSION
         mvn -V -B -e -ntp "-Dstyle.color=always" -DskipTests -T1C clean deploy -s $GITHUB_WORKSPACE/datawave/.github/workflows/settings.xml
         
     - name: Log in to the Container registry