From a890544bbbdf1df9a54d392d3c8ca6d7fc5e735b Mon Sep 17 00:00:00 2001 From: Sergey Grigoriev Date: Tue, 22 Oct 2024 15:35:45 +0200 Subject: [PATCH] feat: checks if weasyprint service should be upgraded Refs: #258 --- .github/workflows/maven-build.yml | 31 ++++++++++++++++++++----------- .pre-commit-config.yaml | 2 ++ pom.xml | 5 +++++ 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index a61a597..33fb155 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -3,6 +3,9 @@ name: maven-build on: push: branches: ['**/**'] + pull_request: + branches: [main] + types: [opened, synchronize, reopened, ready_for_review] jobs: build: runs-on: ubuntu-latest @@ -13,14 +16,15 @@ jobs: COM_SONATYPE_CENTRAL_POLARION_OPENSOURCE_TOKEN: ${{ secrets.COM_SONATYPE_CENTRAL_POLARION_OPENSOURCE_TOKEN }} COM_SONATYPE_CENTRAL_POLARION_OPENSOURCE_GPG_PASSPHRASE: ${{ secrets.COM_SONATYPE_CENTRAL_POLARION_OPENSOURCE_GPG_PASSPHRASE }} GITHUB_TOKEN: ${{ github.token }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} MARKDOWN2HTML_MAVEN_PLUGIN_FAIL_ON_ERROR: true steps: - name: 📄 Checkout - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4 with: fetch-depth: 0 - name: 🧱 Set up JDK and Maven - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4 + uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4 with: distribution: adopt java-version: 17 @@ -33,7 +37,7 @@ jobs: run: echo "cache_key=${{ runner.os }}-mvn-${{ hashFiles('**/pom.xml') }}-${{ github.sha }}" >> $GITHUB_OUTPUT - name: 💾 Prepare Cache id: prepare-cache - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4 + uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4 with: path: | /home/runner/.m2 @@ -88,8 +92,13 @@ jobs: ] - name: 🔘 Print settings.xml run: cat /home/runner/.m2/settings.xml - - name: 📦 Build with Maven - run: mvn --batch-mode clean package -P tests-with-weasyprint-docker + - name: 📦 Build with Maven for Pushes + if: github.event_name == 'push' + run: mvn --batch-mode clean package -P tests-with-weasyprint-docker sonar:sonar -Dsonar.branch.name=${{ github.head_ref }} + - name: 📦 Build with Maven for PRs + if: github.event_name == 'pull_request' + run: mvn --batch-mode clean package -P tests-with-weasyprint-docker sonar:sonar -Dsonar.pullrequest.base=${{ github.base_ref }} -Dsonar.pullrequest.branch=${{ github.head_ref }} + -Dsonar.pullrequest.key=${{ github.event.pull_request.number }} outputs: project_version: ${{ steps.project_version.outputs.project_version }} cache_key: ${{ steps.cache_key.outputs.cache_key }} @@ -107,21 +116,21 @@ jobs: COM_SONATYPE_CENTRAL_POLARION_OPENSOURCE_GPG_PASSPHRASE: ${{ secrets.COM_SONATYPE_CENTRAL_POLARION_OPENSOURCE_GPG_PASSPHRASE }} steps: - name: 🧱 Set up JDK and Maven - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4 + uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4 with: distribution: adopt java-version: 17 gpg-private-key: ${{ secrets.COM_SONATYPE_CENTRAL_POLARION_OPENSOURCE_GPG_PRIVATE_KEY }} - name: 💾 Restore Cache id: restore-cache - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4 + uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4 with: path: | /home/runner/.m2 /home/runner/work key: ${{ needs.build.outputs.cache_key }} - name: 📦 Publish to Maven Central - run: mvn --batch-mode -Dmaven.test.skip=true deploy -P gpg-sign -P nexus-staging + run: mvn --batch-mode deploy -P gpg-sign -P nexus-staging # Deploy release to GitHub Packages deploy-github-packages: @@ -137,20 +146,20 @@ jobs: GITHUB_TOKEN: ${{ github.token }} steps: - name: 🧱 Set up JDK and Maven - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4 + uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4 with: distribution: adopt java-version: 17 - name: 💾 Restore Cache id: restore-cache - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4 + uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4 with: path: | /home/runner/.m2 /home/runner/work key: ${{ needs.build.outputs.cache_key }} - name: 📦 Publish to GitHub Packages - run: mvn --batch-mode -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true deploy -P deploy-github-packages + run: mvn --batch-mode -Dmaven.javadoc.skip=true -Dmaven.source.skip=true deploy -P deploy-github-packages - name: 📦 Upload assets run: |- gh release upload v${{ needs.build.outputs.project_version }} target/*-${{ needs.build.outputs.project_version }}.jar diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ff1c78e..ac7518b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,6 +9,8 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v5.0.0 hooks: + - id: check-added-large-files + - id: check-case-conflict - id: check-merge-conflict - id: trailing-whitespace - id: check-xml diff --git a/pom.xml b/pom.xml index 5021fbd..a116afb 100644 --- a/pom.xml +++ b/pom.xml @@ -203,6 +203,11 @@ maven-javadoc-plugin + + org.sonarsource.scanner.maven + sonar-maven-plugin + + org.apache.maven.plugins maven-source-plugin