Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature/MARP-558-M…
Browse files Browse the repository at this point in the history
…ultilingualism-for-Detail-Page-Description
  • Loading branch information
tutn-axonivy committed Jul 5, 2024
2 parents 72fdc20 + d57f98e commit d911243
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/service-ci-build.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: CI Build
run-name: Build on branch ${{github.ref_name}} triggered by ${{github.actor}}
name: Service CI Build
run-name: Build Service on branch ${{github.ref_name}} triggered by ${{github.actor}}

on:
push:
Expand All @@ -19,7 +19,7 @@ jobs:
distribution: 'temurin'
cache: maven
- name: Tests with Maven
run: mvn clean install
run: mvn clean install --file ./marketplace-service/pom.xml
analysis:
name: Sonarqube analysis
needs: build
Expand All @@ -36,7 +36,7 @@ jobs:
distribution: 'temurin'
- name: Run SonarQube Scanner
run: |
mvn -B verify sonar:sonar \
mvn -B verify sonar:sonar --file ./marketplace-service/pom.xml \
-Dsonar.host.url=${{ env.SONAR_HOST_URL }} \
-Dsonar.projectKey=${{ env.SONAR_PROJECT_KEY }} \
-Dsonar.projectName="AxonIvy Market Service" \
Expand All @@ -46,5 +46,5 @@ jobs:
uses: sonarsource/sonarqube-quality-gate-action@master
timeout-minutes: 5
with:
scanMetadataReportFile: target/sonar/report-task.txt
scanMetadataReportFile: ./marketplace-service/target/sonar/report-task.txt
args: -Dsonar.projectKey=${{ env.SONAR_PROJECT_KEY }}
8 changes: 4 additions & 4 deletions .github/workflows/service-dev-build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: DEV Build
name: Service DEV Build
run-name: Build and Deploy Marketplace-Service on branch ${{github.ref_name}} by ${{github.actor}}

on:
Expand All @@ -21,8 +21,8 @@ jobs:
cache: maven
- name: Update configuration
env:
APP_PROPERTIES_FILE: 'src/main/resources/application.properties'
GITHUB_TOKEN_FILE: 'src/main/resources/github.token'
APP_PROPERTIES_FILE: './marketplace-service/src/main/resources/application.properties'
GITHUB_TOKEN_FILE: './marketplace-service/src/main/resources/github.token'
MONGODB_HOST: ${{ secrets.MONGODB_HOST }}
MONGODB_DATABASE: ${{ secrets.MONGODB_DATABASE }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
Expand All @@ -31,7 +31,7 @@ jobs:
sed -i "s/^spring.data.mongodb.database=.*$/spring.data.mongodb.database=$MONGODB_DATABASE/" $APP_PROPERTIES_FILE
sed -i '1d;$d' $GITHUB_TOKEN_FILE && echo $GH_TOKEN > $GITHUB_TOKEN_FILE
- name: Build with Maven
run: mvn clean package -DskipTests
run: mvn clean package -DskipTests --file ./marketplace-service/pom.xml
- name: Prepare deployment directory
run: mkdir -p deployment && cp target/*.war deployment/
- name: Copy WAR to Tomcat server
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ui-ci-build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI Build
name: UI CI Build
run-name: Build on branch ${{github.ref_name}} triggered by ${{github.actor}}

on:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ui-dev-build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Dev Build
name: UI Dev Build
run-name: Build and Deploy Marketplace-UI on branch ${{github.ref_name}} by ${{github.actor}}

on:
Expand Down

0 comments on commit d911243

Please sign in to comment.