Debug output

quarkiverse · Mar 15, 2024 · 396a52d · 396a52d
1 parent 437a0e5
commit 396a52d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/.github/actions/rebase-dependency-main-branch/action.yml b/.github/actions/rebase-dependency-main-branch/action.yml
@@ -107,15 +107,25 @@ runs:
         sed -i 's|<${{ inputs.dependency-short-name }}.version>[^<]*</${{ inputs.dependency-short-name }}.version>|<${{ inputs.dependency-short-name }}.version>${{ steps.rebuild-dependency.outputs.dependency-version }}</${{ inputs.dependency-short-name }}.version>|' pom.xml
         echo "pom.xml after:"
         cat pom.xml | head -n 50
-        if git diff-index --quiet HEAD --; then
-            echo "${{ inputs.dependency-short-name }}-main uses version ${{ steps.rebuild-dependency.outputs.dependency-version }} already"
-            ./mvnw cq:sync-versions -Dcq.simpleElementWhitespace=AUTODETECT_PREFER_SPACE -N -ntp
+        echo "git status before cq:sync-versions"
+        git status
+        if [ -n "$(git status --porcelain)" ]; then
+          echo "The ${{ inputs.dependency-short-name }}.version change needs to get committed"
+          ./mvnw cq:sync-versions -Dcq.simpleElementWhitespace=AUTODETECT_PREFER_SPACE -N -ntp
+          git add -A
+          echo "git status before commit"
+          git status
+          git commit -m "Upgrade ${{ inputs.dependency-short-name }}.version to ${{ steps.rebuild-dependency.outputs.dependency-version }}"
+        else
+          echo "The ${{ inputs.dependency-short-name }}.version change was already committed"
+          ./mvnw cq:sync-versions -Dcq.simpleElementWhitespace=AUTODETECT_PREFER_SPACE -N -ntp
+          if [ -n "$(git status --porcelain)" ]; then
+            echo "./mvnw cq:sync-versions caused changes"
             git add -A
+            echo "git status before commit"
+            git status
             git commit -m "Re-run mvn cq:sync-versions"
-        else
-            ./mvnw cq:sync-versions -Dcq.simpleElementWhitespace=AUTODETECT_PREFER_SPACE -N -ntp
-            if git diff-index --quiet HEAD --; then
-              git add -A
-              git commit -m "Upgrade ${{ inputs.dependency-short-name }}.version to ${{ steps.rebuild-dependency.outputs.dependency-version }}"
-            fi 
+          fi
         fi
+        echo "git status after commit"
+        git status
diff --git a/.github/actions/rebuild-dependency/action.yml b/.github/actions/rebuild-dependency/action.yml
@@ -50,9 +50,14 @@ runs:
           git clone --quiet --depth 1 --branch main ${{ inputs.dependency-git-repo-url }}
           cd "${{ inputs.dependency-short-name }}"
           echo "Current ${{ inputs.dependency-short-name }} commit:" $(git rev-parse HEAD)
-          sed -i '/<module>integration-tests<\/module>/d' pom.xml
+          if [[ "${{ inputs.dependency-short-name }}" == "quarkus" ]] ; then
+            sed -i '/<module>integration-tests<\/module>/d' pom.xml
+          fi
           mvn=$([[ -f ./mvnw ]] && echo "./mvnw" || echo "mvn")
           "$mvn" clean install -DskipTests -ntp -Dcheckstyle.skip -Dquickly
+          if [[ "${{ inputs.dependency-short-name }}" == "quarkus" ]] ; then
+            "$mvn" install -DskipTests -ntp -Prelease -f independent-projects/resteasy-reactive/server/vertx/pom.xml -Dno-build-cache
+          fi
         fi
 
     - name: Set outputs