From a70918831ed94fed455428eaa10aee357c8913b3 Mon Sep 17 00:00:00 2001 From: Nassim Boutekedjiret Date: Mon, 8 Jan 2024 18:18:13 +0100 Subject: [PATCH 1/3] [#3] Update GitHub release and project site * Updated maven-release.yml. * Added LICENSE. * Updated groupId to `org.sentrysoftware`. * Added site section. --- .github/workflows/maven-release.yml | 234 ++++++++++++------ LICENSE | 201 +++++++++++++++ metricshub-jre-linux/pom.xml | 8 +- metricshub-jre-windows/pom.xml | 8 +- pom.xml | 88 ++++++- src/site/markdown/index.md | 36 +++ .../resources/images/sentry-logo-179x75px.png | Bin 0 -> 4321 bytes src/site/site.xml | 35 +++ 8 files changed, 526 insertions(+), 84 deletions(-) create mode 100644 LICENSE create mode 100644 src/site/markdown/index.md create mode 100644 src/site/resources/images/sentry-logo-179x75px.png create mode 100644 src/site/site.xml diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index aa932f9..a71bd81 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -1,100 +1,186 @@ -name: Build and Release +# Fully automated release to GitHub Packages +# This workflow performs the following operations: +# +# - Create a release branch +# - Prepare the release with Maven +# - Perform the release to GitHub Packages +# - Upload Maven Site to GitHub Pages +# - Publish the packages as a GitHub Release +# - Create a Pull Request to prepare next development version +# +# Requires the GITHUB_TOKEN secret to be defined (workspace or organization) + + +name: Release to GitHub Packages +run-name: Release v${{ inputs.releaseVersion }} to GitHub Packages on: + workflow_call: + inputs: + releaseVersion: + type: string + description: "Release version" + required: true + default: "" + developmentVersion: + type: string + description: "New SNAPSHOT version" + required: true + default: "" + jdkVersion: + type: string + description: "Version of the JDK to setup and use" + required: false + default: "17" + +permissions: + contents: write + pull-requests: write + pages: write + id-token: write + +# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. +# However, do NOT cancel in-progress runs as we want to allow these releases and deployments to complete. +concurrency: + group: release + cancel-in-progress: false + +# Default to bash +defaults: + run: + shell: bash + +jobs: release: - types: [created] + name: Release v${{ inputs.releaseVersion }} + + runs-on: ${{ matrix.os }} -jobs: - build-linux: - runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + outputs: + branchName: ${{ env.branchName }} + steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Set up JDK 17 + + - uses: actions/checkout@v4 + + - name: Set up JDK ${{ inputs.jdkVersion }} uses: actions/setup-java@v4 with: - java-version: '17' - distribution: 'temurin' - cache: 'maven' + java-version: ${{ inputs.jdkVersion }} + distribution: temurin + java-package: jdk + cache: maven server-id: github # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file - - name: Build and Deploy from ubuntu-latest - run: mvn -B deploy --file pom.xml -s $GITHUB_WORKSPACE/settings.xml + - name: Setup GitHub Pages + id: pages + uses: actions/configure-pages@v4 + with: + enablement: true + + - name: Configure Git User + run: | + git config user.email "actions@github.com" + git config user.name "GitHub Actions" + + - name: Set release branch and tag name + run: | + echo "branchName=release/v$INPUT_RELEASEVERSION" >> $GITHUB_ENV + echo "tagName=v$INPUT_RELEASEVERSION" >> $GITHUB_ENV env: - GITHUB_TOKEN: ${{ github.token }} + INPUT_RELEASEVERSION: ${{ inputs.releaseVersion }} - build-windows: - runs-on: windows-latest - - steps: - - name: Checkout code - uses: actions/checkout@v4 + - name: Create ${{ env.branchName }} branch + run: | + git checkout ${{ env.branchName }} 2>/dev/null || git checkout -b ${{ env.branchName }} + git push --force origin ${{ env.branchName }} - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'temurin' - cache: 'maven' - server-id: github # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file + - name: Clean up existing ${{ env.tagName }} tags + run: | + git tag -d ${{ env.tagName }} || true + git push origin :refs/tags/${{ env.tagName }} || true - - name: Build and Deplo from windows-latest - run: mvn -B deploy --file pom.xml -s %GITHUB_WORKSPACE%/settings.xml + - name: Prepare release + id: prepare + run: | + mvn -B -U \ + -Prelease \ + release:clean \ + release:prepare \ + -DpreparationGoals="clean verify site" \ + -DreleaseVersion=${{ inputs.releaseVersion }} \ + -DdevelopmentVersion=${{ inputs.developmentVersion }} \ + -Dresume=false env: GITHUB_TOKEN: ${{ github.token }} - - release: - needs: - - build-linux - - build-windows - runs-on: ubuntu-latest - - steps: - - - name: Get artifact version - shell: bash + - name: Perform release to GitHub Packages + id: release run: | - echo "artifact_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV + mvn -B -U \ + -Prelease \ + release:perform \ + -Dgoals="deploy site" \ + -DworkingDirectory=$GITHUB_WORKSPACE/target/release \ + -DreleaseVersion=${{ inputs.releaseVersion }} \ + -DdevelopmentVersion=${{ inputs.developmentVersion }} \ + env: + GITHUB_TOKEN: ${{ github.token }} - - name: Set up Git + - name: Release rollback on failure run: | - git config --global user.email "actions@github.com" - git config --global user.name "GitHub Actions" - - - name: Create Release - id: create_release + mvn -B -U \ + -Prelease \ + release:rollback \ + if: always() && (steps.prepare.outcome == 'failure' || steps.release.outcome == 'failure') + + - name: Upload Maven Site to GitHub Pages + uses: actions/upload-pages-artifact@v3 + with: + path: ./target/release/target/site + + - name: Create a GitHub Release uses: softprops/action-gh-release@v1 with: + tag_name: ${{ env.tagName }} + fail_on_unmatched_files: false + generate_release_notes: true files: | - metricshub-linux-jre/target/* - metricshub-windows-jre/target/* - env: - GITHUB_TOKEN: ${{ github.token }} + ./target/release/target/*.buildinfo + ./metricshub-jre-windows/target/release/target/*.zip + ./metricshub-jre-linux/target/release/target/*.zip - - name: Upload Release Linux Asset - id: upload-release-linux-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ github.token }} + - name: Create Pull Request from ${{ needs.release.outputs.branchName }} to ${{ github.event.repository.default_branch }} + if: matrix.os == 'ubuntu-latest' + uses: devops-infra/action-pull-request@v0.5.5 with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./metricshub-jre-linux/target/metricshub-jre-linux-${{ env.artifact_version }}.zip - asset_name: metricshub-jre-linux-${{ env.artifact_version }}.zip - asset_content_type: application/zip - - - name: Upload Release Windows Asset - id: upload-release-windows-asset - uses: actions/upload-release-asset@v1 - if: matrix.os == 'windows-latest' - env: - GITHUB_TOKEN: ${{ github.token }} - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./metricshub-jre-windows/target/metricshub-jre-windows-${{ env.artifact_version }}.zip - asset_name: metricshub-jre-windows-${{ env.artifact_version }}.zip - asset_content_type: application/zip + github_token: ${{ github.token }} + source_branch: ${{ needs.release.outputs.branchName }} + target_branch: ${{ github.event.repository.default_branch }} + title: Release v${{ inputs.releaseVersion }} and prepare v${{ inputs.developmentVersion }} + body: | + ## Automated release + + * Release **v${{ inputs.releaseVersion }}** + * Prepare **v${{ inputs.developmentVersion }}** + label: automatic + get_diff: true + allow_no_diff: true + + # Deployment job + deploy: + name: Deploy GitHub Pages + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + needs: release + steps: + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v4 diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/metricshub-jre-linux/pom.xml b/metricshub-jre-linux/pom.xml index 8a2f150..566c2bb 100644 --- a/metricshub-jre-linux/pom.xml +++ b/metricshub-jre-linux/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - com.sentrysoftware.metricshub + org.sentrysoftware metricshub-jre-builder 1.0.00-SNAPSHOT ../pom.xml @@ -16,6 +16,12 @@ + + maven-site-plugin + + true + + org.apache.maven.plugins maven-jlink-plugin diff --git a/metricshub-jre-windows/pom.xml b/metricshub-jre-windows/pom.xml index 001ba5a..cbc3013 100644 --- a/metricshub-jre-windows/pom.xml +++ b/metricshub-jre-windows/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - com.sentrysoftware.metricshub + org.sentrysoftware metricshub-jre-builder 1.0.00-SNAPSHOT ../pom.xml @@ -16,6 +16,12 @@ + + maven-site-plugin + + true + + org.apache.maven.plugins maven-jlink-plugin diff --git a/pom.xml b/pom.xml index 33b3bfd..433dc3d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,15 +4,19 @@ 4.0.0 - com.sentrysoftware.metricshub + org.sentrysoftware metricshub-jre-builder 1.0.00-SNAPSHOT MetricsHub JRE Builder - https://github.com/sentrysoftware/metricshub-jre-builder + pom + https://sentrysoftware.org/metricshub-jre-builder + 2023 + UTF-8 + 2023-10-25T22:28:48Z @@ -33,6 +37,20 @@ https://github.com/sentrysoftware/metricshub-jre-builder/issues/ + + scm:git:https://github.com/sentrysoftware/metricshub-jre-builder.git + https://maven.pkg.github.com/sentrysoftware/metricshub-jre-builder + HEAD + + + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + Bertrand Martin (@bertysentry) @@ -50,11 +68,6 @@ - - scm:git:https://github.com/sentrysoftware/metricshub-jre-builder.git - https://maven.pkg.github.com/sentrysoftware/metricshub-jre-builder - - windows @@ -78,9 +91,69 @@ metricshub-jre-linux + + + release + + + + + + maven-artifact-plugin + 3.5.0 + + + buildinfo + verify + + buildinfo + + + true + + + + + + + + org.apache.maven.plugins + maven-release-plugin + 3.0.1 + + v@{project.version} + + + + default + + perform + + + + + + + + + + maven-site-plugin + 3.12.1 + + + org.sentrysoftware.maven + maven-skin-tools + 1.3.00 + + + + + maven-deploy-plugin + + @@ -135,5 +208,4 @@ - diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md new file mode 100644 index 0000000..8148f7c --- /dev/null +++ b/src/site/markdown/index.md @@ -0,0 +1,36 @@ +# MetricsHub JRE Builder + +This multi-module Maven project uses the [Maven JLink Plugin](https://maven.apache.org/plugins/maven-jlink-plugin/) to create: + +* A custom Windows JRE for MetricsHub, that needs to be integrated into the MetricsHub Windows distribution. +* A custom Linux JRE for MetricsHub, that needs to be integrated into both MetricsHub RHEL and Debian distributions. + +## Usage + +To incorporate the MetricsHub Windows JRE into the MetricsHub Windows package, add the following dependency in the `metricshub-windows` module: + +```xml + + ${project.groupId} + metricshub-jre-windows + ${project.version} + zip + +``` + +To incorporate the MetricsHub Linux JRE into the MetricsHub Linux package (Debian and RHEL), add the following dependency in the `metricshub-debian` and `metricshub-rhel` modules: + +```xml + + ${project.groupId} + metricshub-jre-linux + ${project.version} + zip + +``` + +Make sure to unzip the content of the artifact in a dedicated build directory and provide this directory content to JPackage as a runtime image: + +```shell +jpackage --runtime-image jre_directory $other_args +``` diff --git a/src/site/resources/images/sentry-logo-179x75px.png b/src/site/resources/images/sentry-logo-179x75px.png new file mode 100644 index 0000000000000000000000000000000000000000..42e53f78134d10c1e5f527a9fb12e081e3066d05 GIT binary patch literal 4321 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 + + + + org.sentrysoftware.maven + sentry-maven-skin + 6.2.00 + + + + true + metricshub, jre + + + + images/sentry-logo-179x75px.png + https://metricshub.com + + + + + + + + + + + + + + + \ No newline at end of file From 6373675307df83c670b8d6d140adb6dd7f8c3dfb Mon Sep 17 00:00:00 2001 From: Nassim Boutekedjiret Date: Mon, 8 Jan 2024 19:24:09 +0100 Subject: [PATCH 2/3] [#3] Update GitHub release and project site * site.xml encoding is now UTF-8. --- src/site/site.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/site.xml b/src/site/site.xml index f250991..5b2ad8d 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,4 +1,4 @@ - + Date: Tue, 9 Jan 2024 12:16:43 +0100 Subject: [PATCH 3/3] [#3] Update GitHub release and project site * Updated maven-release.yml --- .github/workflows/maven-deploy.yml | 4 +- .github/workflows/maven-release.yml | 117 ++++++++++-------- README.md | 34 ++++- pom.xml | 81 ++++-------- src/site/markdown/index.md | 36 ------ .../resources/images/sentry-logo-179x75px.png | Bin 4321 -> 0 bytes src/site/site.xml | 35 ------ 7 files changed, 124 insertions(+), 183 deletions(-) delete mode 100644 src/site/markdown/index.md delete mode 100644 src/site/resources/images/sentry-logo-179x75px.png delete mode 100644 src/site/site.xml diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml index f203dbc..9930fca 100644 --- a/.github/workflows/maven-deploy.yml +++ b/.github/workflows/maven-deploy.yml @@ -30,7 +30,7 @@ jobs: settings-path: ${{ github.workspace }} # location for the settings.xml file - name: Build and Deploy from ubuntu-latest - run: mvn -B deploy --file pom.xml -s $GITHUB_WORKSPACE/settings.xml + run: mvn -B deploy env: GITHUB_TOKEN: ${{ github.token }} # Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive @@ -58,7 +58,7 @@ jobs: settings-path: ${{ github.workspace }} # location for the settings.xml file - name: Build and Deploy from windows-latest - run: mvn -B deploy --file pom.xml -s %GITHUB_WORKSPACE%/settings.xml + run: mvn -B deploy env: GITHUB_TOKEN: ${{ github.token }} diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index a71bd81..eff8410 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -15,7 +15,7 @@ name: Release to GitHub Packages run-name: Release v${{ inputs.releaseVersion }} to GitHub Packages on: - workflow_call: + workflow_dispatch: inputs: releaseVersion: type: string @@ -27,11 +27,6 @@ on: description: "New SNAPSHOT version" required: true default: "" - jdkVersion: - type: string - description: "Version of the JDK to setup and use" - required: false - default: "17" permissions: contents: write @@ -51,43 +46,33 @@ defaults: shell: bash jobs: - release: - name: Release v${{ inputs.releaseVersion }} - - runs-on: ${{ matrix.os }} + prepare: + name: Prepare Release v${{ inputs.releaseVersion }} - strategy: - matrix: - os: [ubuntu-latest, windows-latest] + runs-on: ubuntu-latest outputs: branchName: ${{ env.branchName }} - + tagName: ${{ env.tagName }} + steps: - - uses: actions/checkout@v4 - - name: Set up JDK ${{ inputs.jdkVersion }} + - name: Set up JDK 17 uses: actions/setup-java@v4 with: - java-version: ${{ inputs.jdkVersion }} + java-version: "17" distribution: temurin java-package: jdk cache: maven server-id: github # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file - - name: Setup GitHub Pages - id: pages - uses: actions/configure-pages@v4 - with: - enablement: true - - name: Configure Git User run: | git config user.email "actions@github.com" git config user.name "GitHub Actions" - + - name: Set release branch and tag name run: | echo "branchName=release/v$INPUT_RELEASEVERSION" >> $GITHUB_ENV @@ -109,23 +94,50 @@ jobs: id: prepare run: | mvn -B -U \ - -Prelease \ release:clean \ release:prepare \ - -DpreparationGoals="clean verify site" \ + -DpreparationGoals="clean verify" \ -DreleaseVersion=${{ inputs.releaseVersion }} \ -DdevelopmentVersion=${{ inputs.developmentVersion }} \ -Dresume=false env: GITHUB_TOKEN: ${{ github.token }} + - name: Release rollback on failure + run: | + mvn -B -U \ + release:rollback \ + if: always() && (steps.prepare.outcome == 'failure') + + release: + name: Release v${{ inputs.releaseVersion }} + + runs-on: ${{ matrix.os }} + + strategy: + matrix: + os: [ ubuntu-latest, windows-latest ] + + steps: + + - uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: "17" + distribution: temurin + java-package: jdk + cache: maven + server-id: github # Value of the distributionManagement/repository/id field of the pom.xml + settings-path: ${{ github.workspace }} # location for the settings.xml file + - name: Perform release to GitHub Packages - id: release + id: perform run: | mvn -B -U \ - -Prelease \ release:perform \ - -Dgoals="deploy site" \ + -Dgoals=deploy \ -DworkingDirectory=$GITHUB_WORKSPACE/target/release \ -DreleaseVersion=${{ inputs.releaseVersion }} \ -DdevelopmentVersion=${{ inputs.developmentVersion }} \ @@ -135,32 +147,42 @@ jobs: - name: Release rollback on failure run: | mvn -B -U \ - -Prelease \ release:rollback \ - if: always() && (steps.prepare.outcome == 'failure' || steps.release.outcome == 'failure') + if: always() && (steps.perform.outcome == 'failure') + + - uses: actions/upload-artifact@v4 + with: + name: jre-${{ matrix.os }} + path: | + ./target/release/target/*.buildinfo + ./metricshub-jre-*/target/release/target/*.zip + + # Finalize job + finalize: + name: Finalize release + runs-on: ubuntu-latest + needs: [ prepare, release ] + steps: - - name: Upload Maven Site to GitHub Pages - uses: actions/upload-pages-artifact@v3 + - uses: actions/download-artifact@v4 with: - path: ./target/release/target/site + merge-multiple: true - name: Create a GitHub Release uses: softprops/action-gh-release@v1 with: - tag_name: ${{ env.tagName }} + tag_name: ${{ needs.prepare.outputs.tagName }} fail_on_unmatched_files: false generate_release_notes: true files: | - ./target/release/target/*.buildinfo - ./metricshub-jre-windows/target/release/target/*.zip - ./metricshub-jre-linux/target/release/target/*.zip + *.buildinfo + *.zip - - name: Create Pull Request from ${{ needs.release.outputs.branchName }} to ${{ github.event.repository.default_branch }} - if: matrix.os == 'ubuntu-latest' + - name: Create Pull Request from ${{ needs.prepare.outputs.branchName }} to ${{ github.event.repository.default_branch }} uses: devops-infra/action-pull-request@v0.5.5 with: github_token: ${{ github.token }} - source_branch: ${{ needs.release.outputs.branchName }} + source_branch: ${{ needs.prepare.outputs.branchName }} target_branch: ${{ github.event.repository.default_branch }} title: Release v${{ inputs.releaseVersion }} and prepare v${{ inputs.developmentVersion }} body: | @@ -171,16 +193,3 @@ jobs: label: automatic get_diff: true allow_no_diff: true - - # Deployment job - deploy: - name: Deploy GitHub Pages - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - runs-on: ubuntu-latest - needs: release - steps: - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v4 diff --git a/README.md b/README.md index 03c0c24..161ec0b 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # MetricsHub JRE Builder -## Structure +This multi-module Maven project uses the [Maven JLink Plugin](https://maven.apache.org/plugins/maven-jlink-plugin/) to produce two separate JREs: one specifically designed for Windows and another for Linux. The Windows JRE will be integrated into the MetricsHub Windows distribution, while the Linux JRE is to be integrated into both MetricsHub RHEL and Debian distributions. -This is a multi-module project: +## Structure * **/**: the root (parent of all submodules) * **metricshub-jre-windows**: Builds a Windows JRE specifically tailored for MetricsHub, which is then integrated into the MetricsHub Windows distribution. @@ -49,3 +49,33 @@ To deploy MetricsHub JREs to your remote or local repository, run the command be ```sh $ mvn clean deploy ``` + +## Usage + +To integrate the MetricsHub Windows JRE into the MetricsHub Windows distribution, add the following dependency in the `metricshub-windows` module: + +```xml + + ${project.groupId} + metricshub-jre-windows + ${project.version} + zip + +``` + +To integrate the MetricsHub Linux JRE into the MetricsHub Linux distributions (Debian and RHEL), add the following dependency in the `metricshub-debian` and `metricshub-rhel` modules: + +```xml + + ${project.groupId} + metricshub-jre-linux + ${project.version} + zip + +``` + +Make sure to unzip the content of the artifact in a dedicated build directory and provide this directory content to JPackage as a runtime image: + +```shell +jpackage --runtime-image jre_directory $other_jpackage_args +``` diff --git a/pom.xml b/pom.xml index 433dc3d..2d2bf00 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ pom - https://sentrysoftware.org/metricshub-jre-builder + https://github.com/sentrysoftware/metricshub-jre-builder 2023 @@ -91,67 +91,30 @@ metricshub-jre-linux - - - release - - - - - - maven-artifact-plugin - 3.5.0 - - - buildinfo - verify - - buildinfo - - - true - - - - - - - org.apache.maven.plugins - maven-release-plugin - 3.0.1 - - v@{project.version} - - - - default - - perform - - - - - - - - maven-site-plugin - 3.12.1 - - - org.sentrysoftware.maven - maven-skin-tools - 1.3.00 - - + maven-deploy-plugin + - maven-deploy-plugin + maven-artifact-plugin + 3.5.0 + + + buildinfo + verify + + buildinfo + + + true + + + @@ -205,6 +168,16 @@ maven-deploy-plugin 3.1.1 + + + org.apache.maven.plugins + maven-release-plugin + 3.0.1 + + v@{project.version} + true + + diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md deleted file mode 100644 index 8148f7c..0000000 --- a/src/site/markdown/index.md +++ /dev/null @@ -1,36 +0,0 @@ -# MetricsHub JRE Builder - -This multi-module Maven project uses the [Maven JLink Plugin](https://maven.apache.org/plugins/maven-jlink-plugin/) to create: - -* A custom Windows JRE for MetricsHub, that needs to be integrated into the MetricsHub Windows distribution. -* A custom Linux JRE for MetricsHub, that needs to be integrated into both MetricsHub RHEL and Debian distributions. - -## Usage - -To incorporate the MetricsHub Windows JRE into the MetricsHub Windows package, add the following dependency in the `metricshub-windows` module: - -```xml - - ${project.groupId} - metricshub-jre-windows - ${project.version} - zip - -``` - -To incorporate the MetricsHub Linux JRE into the MetricsHub Linux package (Debian and RHEL), add the following dependency in the `metricshub-debian` and `metricshub-rhel` modules: - -```xml - - ${project.groupId} - metricshub-jre-linux - ${project.version} - zip - -``` - -Make sure to unzip the content of the artifact in a dedicated build directory and provide this directory content to JPackage as a runtime image: - -```shell -jpackage --runtime-image jre_directory $other_args -``` diff --git a/src/site/resources/images/sentry-logo-179x75px.png b/src/site/resources/images/sentry-logo-179x75px.png deleted file mode 100644 index 42e53f78134d10c1e5f527a9fb12e081e3066d05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4321 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 - - - - org.sentrysoftware.maven - sentry-maven-skin - 6.2.00 - - - - true - metricshub, jre - - - - images/sentry-logo-179x75px.png - https://metricshub.com - - - - - - - - - - - - - - - \ No newline at end of file