From 161779d9f35f70b0a8a2abd298e987f4a82c11e7 Mon Sep 17 00:00:00 2001 From: Jan-Olav Eide Date: Fri, 17 Jan 2020 09:38:21 +0100 Subject: [PATCH] Update build.yml --- .github/workflows/build.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d94ab0a4..85d462bc 100644 --- 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