add. Workflow and pom changes for omod

Bahmni · Jul 10, 2023 · 12adb60 · 12adb60
1 parent 4a5585e
commit 12adb60
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/build_publish.yml b/.github/workflows/build_publish.yml
@@ -1,13 +1,24 @@
 name: Build and Publish package
 on:
   push:
-    branches: [ master ]
+    branches: [ Bahmni-IPD-master ]
   workflow_dispatch:
 
 jobs:
+  Trivy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Trivy Scan
+        run: |
+          wget -q https://raw.githubusercontent.com/Bahmni/bahmni-infra-utils/main/trivy_scan.sh && chmod +x trivy_scan.sh
+          ./trivy_scan.sh
+          rm trivy_scan.sh
   build-publish-package:
     name: Build and Publish package
     runs-on: macos-11
+    needs: Trivy
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK 1.8
@@ -36,4 +47,3 @@ jobs:
         env:
           NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
           NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
-
diff --git a/.github/workflows/validate_pr.yml b/.github/workflows/validate_pr.yml
@@ -1,7 +1,7 @@
 name: Validate PR
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ Bahmni-IPD-master ]
 
 jobs:
   build:

diff --git a/bahmnicore-api/pom.xml b/bahmnicore-api/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>bahmni</artifactId>
         <version>1.1.0</version>
     </parent>
-    <artifactId>bahmnicore-api</artifactId>
+    <artifactId>bahmnicore-ipd-api</artifactId>
     <packaging>jar</packaging>
     <name>Bahmni EMR Core API</name>
 

diff --git a/bahmnicore-omod/pom.xml b/bahmnicore-omod/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>bahmni</artifactId>
         <version>1.1.0</version>
     </parent>
-    <artifactId>bahmnicore-omod</artifactId>
+    <artifactId>bahmnicore-ipd-omod</artifactId>
     <packaging>jar</packaging>
     <name>Bahmni EMR Core OMOD</name>
 
@@ -61,7 +61,7 @@
         </dependency>
         <dependency>
             <groupId>org.bahmni.module</groupId>
-            <artifactId>bahmnicore-api</artifactId>
+            <artifactId>bahmnicore-ipd-api</artifactId>
             <version>${project.parent.version}</version>
             <exclusions>
                 <exclusion>