diff --git a/.github/release/maven-settings.xml.gpg b/.github/release/maven-settings.xml.gpg deleted file mode 100644 index b342f7c..0000000 Binary files a/.github/release/maven-settings.xml.gpg and /dev/null differ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ad4294d..a3d6ce5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,6 +6,14 @@ on: paths: - '.github/project.yml' +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +defaults: + run: + shell: bash + jobs: release: runs-on: ubuntu-latest @@ -14,69 +22,52 @@ jobs: steps: - uses: radcortez/project-metadata-action@main - name: retrieve project metadata + name: Retrieve project metadata id: metadata with: github-token: ${{secrets.GITHUB_TOKEN}} metadata-file-path: '.github/project.yml' - uses: actions/checkout@v4 - with: - token: ${{secrets.GITHUB_TOKEN}} - - name: Import GPG key - id: import_gpg - uses: crazy-max/ghaction-import-gpg@v6 + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: - gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} - passphrase: ${{ secrets.GPG_PASSPHRASE }} - - - uses: actions/setup-java@v4 - with: - distribution: 'temurin' + distribution: temurin java-version: 17 cache: 'maven' - cache-dependency-path: | - **/pom.xml - .github/project.yml + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} + gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Configure Git author run: | git config --local user.email "action@github.com" git config --local user.name "GitHub Action" - - name: Maven release ${{steps.metadata.outputs.current-version}} + - name: Update latest release version in docs run: | - gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.GPG_PASSPHRASE}}" --output maven-settings.xml .github/release/maven-settings.xml.gpg - git checkout -b release - mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}} -s maven-settings.xml - git commit -am "Update stable version for documentation" - git checkout ${{github.base_ref}} - git rebase release - mvn -B release:perform -Darguments=-DperformRelease -DperformRelease -Prelease -s maven-settings.xml + mvn -B -ntp -pl docs -am generate-resources -Denforcer.skip -Dformatter.skip -Dimpsort.skip + if ! git diff --quiet docs/modules/ROOT/pages/includes/attributes.adoc; then + git add docs/modules/ROOT/pages/includes/attributes.adoc + git commit -m "Update the latest release version ${{steps.metadata.outputs.current-version}} in documentation" + fi - - name: Adjust tag for documentation changes + - name: Maven release ${{steps.metadata.outputs.current-version}} run: | - git checkout ${{steps.metadata.outputs.current-version}} - mvn -B clean install -DskipTests -DskipITs - git commit -am "Update stable version for documentation" - # Move the tag after inclusion of documentation adjustments - git tag -f ${{steps.metadata.outputs.current-version}} - # Go back to main - git checkout main - - - name: Push changes to ${{github.base_ref}} - uses: ad-m/github-push-action@v0.6.0 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: ${{github.base_ref}} + mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}} + mvn -B release:perform -Darguments=-DperformRelease -DperformRelease -Prelease + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - - name: Push tags - uses: ad-m/github-push-action@v0.6.0 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - tags: true - branch: ${{github.base_ref}} + - name: Push changes to ${{github.base_ref}} branch + run: | + git push + git push origin ${{steps.metadata.outputs.current-version}} - uses: radcortez/milestone-release-action@main name: milestone release @@ -84,3 +75,4 @@ jobs: github-token: ${{secrets.GITHUB_TOKEN}} milestone-title: ${{steps.metadata.outputs.current-version}} milestone-next: ${{steps.metadata.outputs.next-version}} + diff --git a/docs/pom.xml b/docs/pom.xml index 266dac3..8f95b11 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -44,7 +44,7 @@ copy-resources - prepare-package + generate-resources copy-resources