diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index e9fb31d6..776ca25b 100644 --- a/.github/workflows/release-project.yml +++ b/.github/workflows/release-project.yml @@ -30,12 +30,6 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - - name: Extract tag name - id: extract_tagname - shell: bash - # Extract the tag name from the git reference, value of GITHUB_REF will be something like refs/tags/. - run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})" - - name: Set up JDK 17 uses: actions/setup-java@v3 with: @@ -56,7 +50,7 @@ jobs: output_file: custom_maven_settings.xml servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]' - name: Set version with Maven - run: ./mvnw -B versions:set -DprocessAllModules=true -DnewVersion=${{ steps.extract_tagname.outputs.tagname }} + run: ./mvnw -B versions:set -DprocessAllModules=true -DnewVersion=${{ github.ref_name }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Deploy with Maven to GitHub Packages and Docker Hub diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index e2e2d2ca..5368b339 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -54,7 +54,7 @@ jobs: run: | echo "sonar_opts=-Dsonar.host.url=https://sonarcloud.io \ -Dsonar.projectKey=com-pas_compas-scl-data-service \ - -Dsonar.organization=com-pas \" >> $GITHUB_OUTPUT + -Dsonar.organization=com-pas" >> $GITHUB_OUTPUT - name: Create custom Maven Settings.xml uses: whelk-io/maven-settings-xml-action@v21 with: