Update build.yml

navikt · Jan 17, 2020 · 161779d · 161779d
1 parent fa303ee
commit 161779d
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,16 +27,20 @@ jobs:
           java-version: 1.11
 
       - name: Hent tag    
-
         run: |
           echo "::set-env name=TAG::$(git log -1 --pretty='%ad' --date=format:'%Y%m%d%H%M%S')-$(echo $GITHUB_SHA | cut -c1-7)"  
        
+      - name: Hent maven version    
+        run: |
+          echo "::set-env name=MVN_VERSION::$(mvn help:evaluate -Dsha1=${TAG} -Dexpression=project.version -q -DforceStdout)"
+         
       - name: Build artifacts & deploy
         shell: bash
         run: |
-          echo "::set-env name=MVN_VERSION::$(mvn help:evaluate -Dsha1=${TAG} -Dexpression=project.version -q -DforceStdout)"
-          mvn --quiet jacoco:prepare-agent deploy  -e --batch-mode --settings ./.github/.m2/settings.xml -Dsha1=${TAG}  -Dsonar.login=${SONAR_TOKEN} -Djacoco.destFile=$(pwd)/target/jacoco.exec
-          mvn jacoco:report sonar:sonar -e --batch-mode --settings .github/.m2/settings.xml -Dsha1=${TAG} -Djacoco.dataFile=$(pwd)/target/jacoco.exec  -Dsonar.login=${SONAR_TOKEN}
+          mvn versions:set -DnewVersion=${MVN_VERSION}
+          mvn --quiet jacoco:prepare-agent deploy  -e --batch-mode --settings ./.github/.m2/settings.xml   -Dsonar.login=${SONAR_TOKEN} -Djacoco.destFile=$(pwd)/target/jacoco.exec
+          mvn jacoco:report sonar:sonar -e --batch-mode --settings .github/.m2/settings.xml  -Djacoco.dataFile=$(pwd)/target/jacoco.exec  -Dsonar.login=${SONAR_TOKEN}
+          mvn versions:revert
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}   
           GITHUB_USERNAME: x-access-token