diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml index dfc4a46..866c6f9 100644 --- a/.forgejo/workflows/release.yaml +++ b/.forgejo/workflows/release.yaml @@ -13,13 +13,9 @@ jobs: if: ${{ !startsWith(github.event.head_commit.message, 'Release') }} steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: "Initialize Environment" - uses: https://w9r.dev/w9r.dev/action-setup-environment@v1.0.4 + id: initialize + uses: https://w9r.dev/w9r.dev/action-setup-environment@v1.1.2 with: roleid: ${{ secrets.VAULT_ROLE_ID }} secretid: ${{ secrets.VAULT_SECRET_ID }} @@ -46,7 +42,9 @@ jobs: NEW_VERSION=${{steps.generate_next_version.outputs.version}} echo NEW_VERSION=$NEW_VERSION >> "$GITHUB_ENV" echo "New version: $NEW_VERSION" - mvn -B --file pom.xml versions:set -DnewVersion=${{ env.NEW_VERSION }} + echo "mvn -B --file pom.xml versions:set -DnewVersion=$NEW_VERSION" + mvn -B --file pom.xml versions:set -DnewVersion=$NEW_VERSION + - name: "Run JReleaser (Changelog)" uses: https://w9r.dev/actions/release-action@main @@ -64,8 +62,8 @@ jobs: - name: "Commit and push changes" run: | - git config --global user.email "${{ steps.import-gpg.outputs.email }}" - git config --global user.name "${{ steps.import-gpg.outputs.name }}" + git config --global user.email "${{ steps.initialize.outputs.gitemail }}" + git config --global user.name "${{ steps.initialize.outputs.gituser }}" git add pom.xml CHANGELOG.md git commit -S -m "Release ${{ env.NEW_VERSION }}" git push diff --git a/.forgejo/workflows/sonarqube.yaml b/.forgejo/workflows/sonarqube.yaml index 6f1cb69..a5d3a44 100644 --- a/.forgejo/workflows/sonarqube.yaml +++ b/.forgejo/workflows/sonarqube.yaml @@ -13,14 +13,8 @@ jobs: name: "SonarQube Trigger" runs-on: ubuntu-latest steps: - - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: "Initialize Environment" - uses: https://w9r.dev/w9r.dev/action-setup-environment@v1.0.4 + uses: https://w9r.dev/w9r.dev/action-setup-environment@v1.1.1 with: roleid: "${{ secrets.VAULT_ROLE_ID }}" secretid: "${{ secrets.VAULT_SECRET_ID }}" @@ -29,8 +23,8 @@ jobs: uses: https://github.com/actions/cache@v4 with: path: ~/.sonar/cache - key: ""${{ runner.os }}-sonar" - restore-keys: ""${{ runner.os }}-sonar" + key: "${{ runner.os }}-sonar" + restore-keys: "${{ runner.os }}-sonar" - name: "SonarQube Scan" env: