Merge pull request #16 from kabir/port-to-glow-package-vs-install

Ears need to use install to populate the mvn repo, or mvn wildfly:sta…
wildfly · Jan 12, 2024 · 9cbc2f8 · 9cbc2f8
2 parents 19afb90 + c3a8e3d
commit 9cbc2f8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/quickstart_ci.yml b/.github/workflows/quickstart_ci.yml
@@ -47,6 +47,12 @@ on:
         required: false
         default: ''
         type: string
+      MVN_COMMAND:
+        description: 'Maven command to use when building the project. Default is ''package'', ears needs ''install'''
+        required: false
+        default: 'package'
+        type: string
+
 
 # Only run the latest job
 concurrency:
@@ -101,15 +107,16 @@ jobs:
         run: |
           cd quickstarts
           cd ${{ inputs.QUICKSTART_PATH }}
-          mvn -fae clean install -Drelease
+          # Make sure it builds
+          mvn -fae clean package -Drelease
         shell: bash
       - name: Build, run & test ${{ inputs.QUICKSTART_PATH }} Quickstart with provisioned-server profile
         if: ${{ inputs.TEST_PROVISIONED_SERVER }}
         run: |
           cd quickstarts
           cd ${{ inputs.QUICKSTART_PATH }}
           echo "Building provisioned server..."
-          mvn -fae clean package -Pprovisioned-server
+          mvn -fae clean ${{ env.MVN_COMMAND }} -Pprovisioned-server
           if [ -f ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh ]; then 
             echo "Add quickstartUser..."
             ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users'
@@ -129,7 +136,7 @@ jobs:
           cd quickstarts
           cd ${{ inputs.QUICKSTART_PATH }}
           echo "Building bootable jar..."
-          mvn -fae clean package -Pbootable-jar
+          mvn -fae clean ${{ env.MVN_COMMAND }} -Pbootable-jar
           echo "Starting bootable jar..."
           mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start-jar -Dstartup-timeout=120  ${{ inputs.EXTRA_RUN_ARGS }}
           echo "Testing bootable jar..."
@@ -216,7 +223,7 @@ jobs:
           cd quickstarts
           cd ${{ inputs.QUICKSTART_PATH }}
           echo "Building provisioned server..."
-          mvn -fae clean package -Pprovisioned-server -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{ env.WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS }}
+          mvn -fae clean ${{ env.MVN_COMMAND }} -Pprovisioned-server -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{ env.WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS }}
           if [ -f ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh ]; then
             echo "Add quickstartUser..."
             ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users'
@@ -236,7 +243,7 @@ jobs:
           cd quickstarts
           cd ${{ inputs.QUICKSTART_PATH }}
           echo "Building bootable jar..."
-          mvn -fae clean package -Pbootable-jar -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{ env.WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS }}
+          mvn -fae clean ${{ env.MVN_COMMAND }} -Pbootable-jar -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{ env.WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS }}
           echo "Starting bootable jar..."
           mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start-jar -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }}
           echo "Testing bootable jar..."

diff --git a/.github/workflows/quickstart_ejb-throws-exception_ci.yml b/.github/workflows/quickstart_ejb-throws-exception_ci.yml
@@ -14,4 +14,5 @@ jobs:
       QUICKSTART_PATH: ejb-throws-exception
       DEPLOYMENT_DIR: ear
       TEST_PROVISIONED_SERVER: true
-      TEST_OPENSHIFT: false
+      TEST_OPENSHIFT: false
+      MVN_COMMAND: install