Skip to content

Commit

Permalink
MARP-626 Fix for Dev Fail on Market-Monitor (#256)
Browse files Browse the repository at this point in the history
  • Loading branch information
phhung-axonivy authored Aug 6, 2024
1 parent dccac7e commit bf8ae47
Show file tree
Hide file tree
Showing 11 changed files with 73 additions and 35 deletions.
26 changes: 19 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions aspose-barcode-demo-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<packaging>iar-integration-test</packaging>

<properties>
<project-build-plugin-version>10.0.14</project-build-plugin-version>
<web-tester.version>10.0.14</web-tester.version>
<project.build.plugin.version>10.0.16</project.build.plugin.version>
<tester.version>10.0.16</tester.version>
</properties>

<dependencies>
Expand All @@ -21,7 +21,7 @@
<dependency>
<groupId>com.axonivy.ivy.webtest</groupId>
<artifactId>web-tester</artifactId>
<version>${web-tester.version}</version>
<version>${tester.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -32,7 +32,7 @@
<plugin>
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<version>${project-build-plugin-version}</version>
<version>${project.build.plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
Expand Down
4 changes: 2 additions & 2 deletions aspose-barcode-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<version>10.0.11-SNAPSHOT</version>
<packaging>iar</packaging>
<properties>
<project-build-plugin-version>10.0.14</project-build-plugin-version>
<project.build.plugin.version>10.0.16</project.build.plugin.version>
<aspose.version>23.4</aspose.version>
</properties>
<dependencies>
Expand Down Expand Up @@ -39,7 +39,7 @@
<plugin>
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<version>${project-build-plugin-version}</version>
<version>${project.build.plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
Expand Down
8 changes: 4 additions & 4 deletions aspose-email-demo-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<packaging>iar-integration-test</packaging>

<properties>
<project-build-plugin-version>10.0.14</project-build-plugin-version>
<web-tester.version>10.0.14</web-tester.version>
<project.build.plugin.version>10.0.16</project.build.plugin.version>
<tester.version>10.0.16</tester.version>
<selenide.version>6.9.0</selenide.version>
</properties>

Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>com.axonivy.ivy.webtest</groupId>
<artifactId>web-tester</artifactId>
<version>${web-tester.version}</version>
<version>${tester.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -45,7 +45,7 @@
<plugin>
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<version>${project-build-plugin-version}</version>
<version>${project.build.plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
Expand Down
4 changes: 2 additions & 2 deletions aspose-email-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<version>10.0.11-SNAPSHOT</version>
<packaging>iar</packaging>
<properties>
<project-build-plugin-version>10.0.14</project-build-plugin-version>
<project.build.plugin.version>10.0.16</project.build.plugin.version>
<aspose.version>23.4</aspose.version>
</properties>
<dependencies>
Expand Down Expand Up @@ -40,7 +40,7 @@
<plugin>
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<version>${project-build-plugin-version}</version>
<version>${project.build.plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
Expand Down
8 changes: 4 additions & 4 deletions doc-factory-demos-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<packaging>iar-integration-test</packaging>

<properties>
<project-build-plugin-version>10.0.14</project-build-plugin-version>
<web-tester.version>10.0.14</web-tester.version>
<project.build.plugin.version>10.0.16</project.build.plugin.version>
<tester.version>10.0.16</tester.version>
<selenide.version>6.9.0</selenide.version>
</properties>

Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>com.axonivy.ivy.webtest</groupId>
<artifactId>web-tester</artifactId>
<version>${web-tester.version}</version>
<version>${tester.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -41,7 +41,7 @@
<plugin>
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<version>${project-build-plugin-version}</version>
<version>${project.build.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<deployToEngineApplication>doc-factory</deployToEngineApplication>
Expand Down
11 changes: 9 additions & 2 deletions doc-factory-demos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,21 @@
<packaging>iar</packaging>

<properties>
<project-build-plugin-version>10.0.14</project-build-plugin-version>
<project.build.plugin.version>10.0.16</project.build.plugin.version>
</properties>

<repositories>
<repository>
<id>aspose.com</id>
<url>https://repository.aspose.com/repo</url>
</repository>
<repository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>

<dependencies>
Expand All @@ -31,7 +38,7 @@
<plugin>
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<version>${project-build-plugin-version}</version>
<version>${project.build.plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
Expand Down
16 changes: 13 additions & 3 deletions doc-factory-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
<packaging>iar</packaging>

<properties>
<project-build-plugin-version>10.0.14</project-build-plugin-version>
<project.build.plugin.version>10.0.16</project.build.plugin.version>
<tester.version>10.0.16</tester.version>
<pdfbox.version>2.0.28</pdfbox.version>
<powermock2.version>2.0.9</powermock2.version>
</properties>
Expand All @@ -22,7 +23,7 @@
<dependency>
<groupId>com.axonivy.ivy.test</groupId>
<artifactId>unit-tester</artifactId>
<version>10.0.0</version>
<version>${tester.version}</version>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
Expand Down Expand Up @@ -50,7 +51,7 @@
<plugin>
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<version>${project-build-plugin-version}</version>
<version>${project.build.plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
Expand All @@ -68,4 +69,13 @@
</snapshots>
</pluginRepository>
</pluginRepositories>
<repositories>
<repository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>
</project>
11 changes: 9 additions & 2 deletions doc-factory/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<packaging>iar</packaging>

<properties>
<project-build-plugin-version>10.0.14</project-build-plugin-version>
<project.build.plugin.version>10.0.16</project.build.plugin.version>
<aspose.version>23.4</aspose.version>
</properties>

Expand All @@ -16,6 +16,13 @@
<id>aspose.com</id>
<url>https://repository.aspose.com/repo</url>
</repository>
<repository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>
<dependencies>
<dependency>
Expand Down Expand Up @@ -54,7 +61,7 @@
<plugin>
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<version>${project-build-plugin-version}</version>
<version>${project.build.plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
Expand Down

0 comments on commit bf8ae47

Please sign in to comment.