Fixups

ppalaga · Mar 15, 2024 · 5757a43 · 5757a43
1 parent 0128b5a
commit 5757a43
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 12 deletions.
diff --git a/.github/actions/rebase-dependency-main-branch/action.yml b/.github/actions/rebase-dependency-main-branch/action.yml
@@ -28,6 +28,14 @@ outputs:
   dependency-version:
     description: "The version of the dependency as present in the top pom.xml of its main branch"
     value: ${{ steps.checkout-dependency.outputs.dependency-version }}
+  exit-status:
+    description: |
+      A short string describing how the execution went. 
+      It can be one of the following:
+        * success
+        * rebase-failed
+        * build-failed
+    value: ${{ env.REBASE_DEPENDENCY_MAIN_EXIT_STATUS }}
 
 runs:
   using: 'composite'
@@ -42,6 +50,7 @@ runs:
     - name: rebase ${{ inputs.dependency-short-name }}-main
       shell: bash
       run: |
+        echo "REBASE_DEPENDENCY_MAIN_EXIT_STATUS=success" >> $GITHUB_ENV
         git fetch origin main
         git reset --hard origin/main
         git fetch origin ${{ inputs.dependency-short-name }}-main
@@ -57,9 +66,10 @@ runs:
       if: ${{ failure() }}
       shell: bash
       run: |
+        echo "REBASE_DEPENDENCY_MAIN_EXIT_STATUS=rebase-failed" >> $GITHUB_ENV
         oldState=$(gh issue view ${{ inputs.issue-id }} --json state -q .state -R ${{ github.repository }})
         echo "oldState = $oldState"
-        msg="Could not rebase ${{ inputs.dependency-short-name }}-main in ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+        msg="❌ Could not rebase ${{ inputs.dependency-short-name }}-main in ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
         if [[ "$oldState" == "OPEN" ]] ; then
           gh issue comment \
             --repo ${{ github.repository }} \
@@ -75,7 +85,6 @@ runs:
         GH_TOKEN: ${{ inputs.token }}
 
     - name: Install xmllint
-      id: checkout-dependency
       shell: bash
       run: |
         sudo apt-get -qq install -y libxml2-utils
@@ -86,10 +95,10 @@ runs:
       run: |
         cd ~
         [[ -d "${{ inputs.dependency-short-name }}" ]] || git clone --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)" \
-          && echo "dependency-commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT \
-          && echo "dependency-version=$(xmllint --xpath "/*[local-name() = 'project']/*[local-name() = 'version']/text()" pom.xml)" >> $GITHUB_OUTPUT
+        cd "${{ inputs.dependency-short-name }}"
+        echo "Current ${{ inputs.dependency-short-name }} commit: $(git rev-parse HEAD)"
+        echo "dependency-commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+        echo "dependency-version=$(xmllint --xpath "/*[local-name() = 'project']/*[local-name() = 'version']/text()" pom.xml)" >> $GITHUB_OUTPUT
 
     - name: Set ${{ inputs.dependency-short-name }}.version to ${{ steps.checkout-dependency.outputs.dependency-version }}
       shell: bash

diff --git a/.github/workflows/quarkus-main-rebase.yml b/.github/workflows/quarkus-main-rebase.yml
@@ -47,20 +47,39 @@ jobs:
         git push origin ${{ env.DEPENDENCY_SHORT_NAME }}-main -f
 
     - name: Reopen issue https://github.com/${{ github.repository }}/issues/${{ inputs.issue-id }}
-      if: ${{ failure() }}
+      if: ${{ steps.rebase-dependency-main-branch.outputs.exit-status != 'success' && failure() }}
       shell: bash
       run: |
-        gh issue reopen \
-          --repo ${{ github.repository }} \
-          --comment "Build with ${{ env.DEPENDENCY_SHORT_NAME }} ${{ steps.rebase-dependency-main-branch.outputs.dependency-commit }} failed in ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
-          ${{ env.ISSUE_ID }}
+        oldState=$(gh issue view ${{ inputs.issue-id }} --json state -q .state -R ${{ github.repository }})
+        echo "oldState = $oldState"
+        msg="❌ Build with ${{ env.DEPENDENCY_SHORT_NAME }} ${{ steps.rebase-dependency-main-branch.outputs.dependency-commit }} failed in ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+        if [[ "$oldState" == "OPEN" ]] ; then
+          gh issue comment \
+            --repo ${{ github.repository }} \
+            --body "$msg" \
+            ${{ inputs.issue-id }}
+        else
+          gh issue reopen \
+            --repo ${{ github.repository }} \
+            --comment "$msg" \
+            ${{ inputs.issue-id }}
+        fi
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Close issue https://github.com/${{ github.repository }}/issues/${{ inputs.issue-id }}
       if: ${{ success() }}
       shell: bash
-      run: gh issue close --repo ${{ github.repository }} ${{ env.ISSUE_ID }}
+      run: |
+        oldState=$(gh issue view ${{ inputs.issue-id }} --json state -q .state -R ${{ github.repository }})
+        echo "oldState = $oldState"
+        msg="✅ Build with ${{ env.DEPENDENCY_SHORT_NAME }} ${{ steps.rebase-dependency-main-branch.outputs.dependency-commit }} succeeded in ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+        if [[ "$oldState" != "CLOSED" ]] ; then
+          gh issue close \
+            --repo ${{ github.repository }} \
+            --comment "$msg" \
+            ${{ inputs.issue-id }}
+        fi
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}