diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml index 28fcc1d..700dd75 100644 --- a/.forgejo/workflows/release.yaml +++ b/.forgejo/workflows/release.yaml @@ -1,22 +1,21 @@ --- name: release - on: push: branches: - main - - jobs: release: name: Release runs-on: ubuntu-latest if: ${{ !startsWith(github.event.head_commit.message, 'Release') }} + env: + JRELEASER_OUTPUT_DIRECTORY: target steps: - name: "Initialize Environment" id: initialize - uses: https://w9r.dev/w9r.dev/action-setup-environment@v1.1.2 + uses: https://w9r.dev/w9r.dev/action-setup-environment@v1.1.3 with: roleid: ${{ secrets.VAULT_ROLE_ID }} secretid: ${{ secrets.VAULT_SECRET_ID }} @@ -35,17 +34,12 @@ jobs: suffix: '' - name: "Set new version" - env: - MAVEN_USERNAME: ${{ env.NEXUS_USERNAME }} - MAVEN_CENTRAL_TOKEN: ${{ env.NEXUS_PASSWORD }} - MAVEN_GPG_PASSPHRASE: ${{ env.GPG_PASSPHRASE }} run: | NEW_VERSION=${{steps.generate_next_version.outputs.version}} echo NEW_VERSION=$NEW_VERSION >> "$GITHUB_ENV" + echo JRELEASER_PROJECT_VERSION=$NEW_VERSION >> "$GITHUB_ENV" echo "New version: $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 @@ -53,28 +47,17 @@ jobs: arguments: changelog --debug setup-java: false continue-on-error: true - env: - JRELEASER_OUTPUT_DIRECTORY: target - JRELEASER_PROJECT_VERSION: ${{ env.NEW_VERSION }} - JRELEASER_GITEA_TOKEN: ${{ env.JRELEASER_GITEA_TOKEN }} - JRELEASER_GPG_PASSPHRASE: ${{ env.RELEASEBOT_PASSPHRASE }} - JRELEASER_GPG_PUBLIC_KEY: ${{ env.RELEASEBOT_PUBLIC_KEY }} - JRELEASER_GPG_SECRET_KEY: ${{ env.RELEASEBOT_PRIVATE_KEY }} - name: "Commit and push changes" uses: https://w9r.dev/w9r.dev/action-git-commit-push@v1.4 with: email: ${{ steps.initialize.outputs.gitemail }} name: ${{ steps.initialize.outputs.gituser }} - commit_message: "Release ${{ env.NEW_VERSION }} [skip ci]" + commit_message: "Release ${{ env.JRELEASER_PROJECT_VERSION }} [skip ci]" files: pom.xml CHANGELOG.md access_token: ${{ env.JRELEASER_GITEA_TOKEN }} - name: Build package and populate staging area for deployment - env: - MAVEN_USERNAME: ${{ env.NEXUS_USERNAME }} - MAVEN_CENTRAL_TOKEN: ${{ env.NEXUS_PASSWORD }} - MAVEN_GPG_PASSPHRASE: ${{ env.GPG_PASSPHRASE }} run: | mvn -X -B --file pom.xml package mvn -X --file pom.xml -Ppublication @@ -85,28 +68,12 @@ jobs: arguments: assemble --debug setup-java: false continue-on-error: true - env: - JRELEASER_OUTPUT_DIRECTORY: target - JRELEASER_PROJECT_VERSION: ${{ env.NEW_VERSION }} - JRELEASER_GITEA_TOKEN: ${{ env.JRELEASER_GITEA_TOKEN }} - JRELEASER_GPG_PASSPHRASE: ${{ env.RELEASEBOT_PASSPHRASE }} - JRELEASER_GPG_PUBLIC_KEY: ${{ env.RELEASEBOT_PUBLIC_KEY }} - JRELEASER_GPG_SECRET_KEY: ${{ env.RELEASEBOT_PRIVATE_KEY }} - name: "Run JReleaser (Release)" uses: https://w9r.dev/actions/release-action@main with: arguments: release --debug setup-java: false - env: - JRELEASER_OUTPUT_DIRECTORY: target - JRELEASER_PROJECT_VERSION: ${{ env.NEW_VERSION }} - JRELEASER_GITEA_TOKEN: ${{ env.JRELEASER_GITEA_TOKEN }} - JRELEASER_GPG_PASSPHRASE: ${{ env.RELEASEBOT_PASSPHRASE }} - JRELEASER_GPG_PUBLIC_KEY: ${{ env.RELEASEBOT_PUBLIC_KEY }} - JRELEASER_GPG_SECRET_KEY: ${{ env.RELEASEBOT_PRIVATE_KEY }} - JRELEASER_ARTIFACTORY_USERNAME: ${{ env.NEXUS_USERNAME }} - JRELEASER_ARTIFACTORY_TOKEN: ${{ env.NEXUS_PASSWORD }} - name: JReleaser release trace if: always() diff --git a/.forgejo/workflows/sonarqube.yaml b/.forgejo/workflows/sonarqube.yaml index a5d3a44..ce10aca 100644 --- a/.forgejo/workflows/sonarqube.yaml +++ b/.forgejo/workflows/sonarqube.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: "Initialize Environment" - uses: https://w9r.dev/w9r.dev/action-setup-environment@v1.1.1 + uses: https://w9r.dev/w9r.dev/action-setup-environment@v1.1.3 with: roleid: "${{ secrets.VAULT_ROLE_ID }}" secretid: "${{ secrets.VAULT_SECRET_ID }}" @@ -27,7 +27,4 @@ jobs: restore-keys: "${{ runner.os }}-sonar" - name: "SonarQube Scan" - env: - SONAR_TOKEN: "${{ env.SONARQUBE_TOKEN }}" - SONAR_HOST_URL: "${{ env.SONARQUBE_HOST }}" run: "mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar"