From bf8ae4794b2f5c06c1c6b7a15879205258971462 Mon Sep 17 00:00:00 2001 From: Pham Hoang Hung <84316773+phhung-axonivy@users.noreply.github.com> Date: Tue, 6 Aug 2024 13:37:12 +0700 Subject: [PATCH] MARP-626 Fix for Dev Fail on Market-Monitor (#256) --- .github/workflows/ci.yml | 26 +++++++++++++++++++------- .github/workflows/dev.yml | 4 +++- .github/workflows/release.yml | 8 ++++---- aspose-barcode-demo-test/pom.xml | 8 ++++---- aspose-barcode-demo/pom.xml | 4 ++-- aspose-email-demo-test/pom.xml | 8 ++++---- aspose-email-demo/pom.xml | 4 ++-- doc-factory-demos-test/pom.xml | 8 ++++---- doc-factory-demos/pom.xml | 11 +++++++++-- doc-factory-test/pom.xml | 16 +++++++++++++--- doc-factory/pom.xml | 11 +++++++++-- 11 files changed, 73 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 20f11744..82374537 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,19 +11,25 @@ on: type: string default: '-Divy.engine.download.url=https://dev.axonivy.com/permalink/nightly-10/axonivy-engine.zip' required: false + javaVersion: + type: number + default: 17 + mvnVersion: + type: string + default: 3.6.3 jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Java JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - java-version: 17 + java-version: ${{ inputs.javaVersion || '17' }} distribution: temurin - name: Decide to deploy or not @@ -44,8 +50,13 @@ jobs: "password": "${{ secrets.NEXUS_AXONIVY_COM_PASSWORD }}" }] + - name: Setup Maven + uses: stCarolas/setup-maven@v5 + with: + maven-version: ${{ inputs.mvnVersion || '3.6.3' }} + - name: Build with Maven - run: mvn clean ${{ steps.condval.outputs.value }} --batch-mode ${{ inputs.mvnArgs }} + run: mvn clean ${{ steps.condval.outputs.value }} --batch-mode --fail-at-end ${{ inputs.mvnArgs }} - name: Publish Unit Test Results uses: EnricoMi/publish-unit-test-result-action@v2 @@ -56,14 +67,15 @@ jobs: !*/target/*-reports/failsafe-summary.xml - name: Archive build artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: | */target/*.iar + */target/*-[0-9]*.jar *product/target/*.zip - name: Archive test reports - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: name: test-reports diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 150beb57..7c8b09c8 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -11,4 +11,6 @@ jobs: uses: './.github/workflows/ci.yml' secrets: inherit with: - mvnArgs: '"-Divy.engine.download.url=https://dev.axonivy.com/permalink/dev/axonivy-engine.zip" "-Divy.engine.version=11.4.0" "-Dproject-build-plugin-version=11.4.0-SNAPSHOT" "-Dweb-tester.version=11.4.0-SNAPSHOT" "-Dselenide.version=7.0.3" -Dmaven.deploy.skip=true' + mvnArgs: '"-Divy.engine.download.url=https://dev.axonivy.com/permalink/dev/axonivy-engine.zip" "-Divy.engine.version=(10.0.0,]" "-Dproject.build.plugin.version=11.4.0-SNAPSHOT" "-Dtester.version=11.4.0-SNAPSHOT" "-Dselenide.version=7.0.3" -Dmaven.deploy.skip=true' + javaVersion: 21 + mvnVersion: 3.9.8 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 99fa47d3..0eddad9f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,17 +5,17 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Get branch name id: branch-name - uses: tj-actions/branch-names@v6 + uses: tj-actions/branch-names@v8 - name: Setup Java JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 distribution: temurin diff --git a/aspose-barcode-demo-test/pom.xml b/aspose-barcode-demo-test/pom.xml index f02eec02..29224635 100644 --- a/aspose-barcode-demo-test/pom.xml +++ b/aspose-barcode-demo-test/pom.xml @@ -7,8 +7,8 @@ iar-integration-test - 10.0.14 - 10.0.14 + 10.0.16 + 10.0.16 @@ -21,7 +21,7 @@ com.axonivy.ivy.webtest web-tester - ${web-tester.version} + ${tester.version} test @@ -32,7 +32,7 @@ com.axonivy.ivy.ci project-build-plugin - ${project-build-plugin-version} + ${project.build.plugin.version} true diff --git a/aspose-barcode-demo/pom.xml b/aspose-barcode-demo/pom.xml index 85e2e0ab..cf9799ee 100644 --- a/aspose-barcode-demo/pom.xml +++ b/aspose-barcode-demo/pom.xml @@ -6,7 +6,7 @@ 10.0.11-SNAPSHOT iar - 10.0.14 + 10.0.16 23.4 @@ -39,7 +39,7 @@ com.axonivy.ivy.ci project-build-plugin - ${project-build-plugin-version} + ${project.build.plugin.version} true diff --git a/aspose-email-demo-test/pom.xml b/aspose-email-demo-test/pom.xml index 3bfeac40..e6fff4ee 100644 --- a/aspose-email-demo-test/pom.xml +++ b/aspose-email-demo-test/pom.xml @@ -7,8 +7,8 @@ iar-integration-test - 10.0.14 - 10.0.14 + 10.0.16 + 10.0.16 6.9.0 @@ -22,7 +22,7 @@ com.axonivy.ivy.webtest web-tester - ${web-tester.version} + ${tester.version} test @@ -45,7 +45,7 @@ com.axonivy.ivy.ci project-build-plugin - ${project-build-plugin-version} + ${project.build.plugin.version} true diff --git a/aspose-email-demo/pom.xml b/aspose-email-demo/pom.xml index 5e94a9bb..36b3ed9c 100644 --- a/aspose-email-demo/pom.xml +++ b/aspose-email-demo/pom.xml @@ -6,7 +6,7 @@ 10.0.11-SNAPSHOT iar - 10.0.14 + 10.0.16 23.4 @@ -40,7 +40,7 @@ com.axonivy.ivy.ci project-build-plugin - ${project-build-plugin-version} + ${project.build.plugin.version} true diff --git a/doc-factory-demos-test/pom.xml b/doc-factory-demos-test/pom.xml index 3997e728..2cf29a08 100644 --- a/doc-factory-demos-test/pom.xml +++ b/doc-factory-demos-test/pom.xml @@ -7,8 +7,8 @@ iar-integration-test - 10.0.14 - 10.0.14 + 10.0.16 + 10.0.16 6.9.0 @@ -22,7 +22,7 @@ com.axonivy.ivy.webtest web-tester - ${web-tester.version} + ${tester.version} test @@ -41,7 +41,7 @@ com.axonivy.ivy.ci project-build-plugin - ${project-build-plugin-version} + ${project.build.plugin.version} true doc-factory diff --git a/doc-factory-demos/pom.xml b/doc-factory-demos/pom.xml index d16c1cf9..a9dc9cfb 100644 --- a/doc-factory-demos/pom.xml +++ b/doc-factory-demos/pom.xml @@ -7,7 +7,7 @@ iar - 10.0.14 + 10.0.16 @@ -15,6 +15,13 @@ aspose.com https://repository.aspose.com/repo + + sonatype + https://oss.sonatype.org/content/repositories/snapshots + + always + + @@ -31,7 +38,7 @@ com.axonivy.ivy.ci project-build-plugin - ${project-build-plugin-version} + ${project.build.plugin.version} true diff --git a/doc-factory-test/pom.xml b/doc-factory-test/pom.xml index 52d8bbdc..392879db 100644 --- a/doc-factory-test/pom.xml +++ b/doc-factory-test/pom.xml @@ -7,7 +7,8 @@ iar - 10.0.14 + 10.0.16 + 10.0.16 2.0.28 2.0.9 @@ -22,7 +23,7 @@ com.axonivy.ivy.test unit-tester - 10.0.0 + ${tester.version} org.apache.pdfbox @@ -50,7 +51,7 @@ com.axonivy.ivy.ci project-build-plugin - ${project-build-plugin-version} + ${project.build.plugin.version} true @@ -68,4 +69,13 @@ + + + sonatype + https://oss.sonatype.org/content/repositories/snapshots + + always + + + diff --git a/doc-factory/pom.xml b/doc-factory/pom.xml index 4ab8e229..6e53d9e0 100644 --- a/doc-factory/pom.xml +++ b/doc-factory/pom.xml @@ -7,7 +7,7 @@ iar - 10.0.14 + 10.0.16 23.4 @@ -16,6 +16,13 @@ aspose.com https://repository.aspose.com/repo + + sonatype + https://oss.sonatype.org/content/repositories/snapshots + + always + + @@ -54,7 +61,7 @@ com.axonivy.ivy.ci project-build-plugin - ${project-build-plugin-version} + ${project.build.plugin.version} true