Merge branch 'master' of github.com:dotCMS/core into issue-25951-impl…

…ement-gha-generate-cli-release # Conflicts: # .github/workflows/cli-cicd-test.yml
dotCMS · Sep 27, 2023 · 7eeb9af · 7eeb9af
2 parents 1226677 + 5c27e3e
commit 7eeb9af
Show file tree

Hide file tree

Showing 210 changed files with 5,473 additions and 1,178 deletions.
diff --git a/.github/workflows/build-report.yml b/.github/workflows/build-report.yml
@@ -48,6 +48,7 @@ jobs:
             echo "::warn title=Artifact 'workflow-data' missing::Expected artifact 'workflow-data' does not exist for pull_request event."
           else
             json=$(jq -c '.' workflow-data.json)
+            trigger_event_name=$(echo $json | jq -r '.trigger_event_name // "null"')
             status=$(echo $json | jq -r '.aggregate_status // "null"')
             pr_number=$(echo $json | jq -r '.pr_number // "null"')
             pr_author=$(echo $json | jq -r '.pr_author // "null"')
@@ -86,7 +87,20 @@ jobs:
             else
               echo "status_icon=❌" >> $GITHUB_OUTPUT
             fi
+          
+            if [[ "$trigger_event_name" == "pull_request" ]]; then
+              echo "report_type=PR" >> $GITHUB_OUTPUT
+            elif [[ "$trigger_event_name" == "merge_group" ]]; then
+              echo "report_type=Merge Queue" >> $GITHUB_OUTPUT
+            elif [[ "$trigger_event_name" == "push" ]]; then
+              echo "report_type=Branch Merge" >> $GITHUB_OUTPUT
+            else 
+               echo "report_type=$trigger_event_name" >> $GITHUB_OUTPUT
+            fi
+            
+          
             echo "json=$json" >> $GITHUB_OUTPUT
+            echo "trigger_event_name=$trigger_event_name" >> $GITHUB_OUTPUT
             echo "has-json=true" >> $GITHUB_OUTPUT
             echo "status=$status" >> $GITHUB_OUTPUT
             echo "pr_number=$pr_number" >> $GITHUB_OUTPUT
@@ -111,23 +125,24 @@ jobs:
             echo "test_failed=$test_failed" >> $GITHUB_OUTPUT
             echo "test_skipped=$test_skipped" >> $GITHUB_OUTPUT
             echo "test_elapsed=$test_elapsed" >> $GITHUB_OUTPUT
+          
           fi
           
       - name: Post to a Slack channel
-        if: steps.workflow-data.outputs.has-json == 'true'
-        id: slack
+        if: steps.workflow-data.outputs.has-json == 'true' && steps.workflow-data.outputs.report_type == 'PR'
+        id: slack-pr
         uses: slackapi/slack-github-action@v1.24.0
         with:
           channel-id: ${{ vars.SLACK_REPORT_CHANNEL }}
           payload: |
             {
-              "text": "Github Action ${{ steps.workflow-data.outputs.status }} for run PR #${{ steps.workflow-data.outputs.pr_number }}",
+              "text": "Github Action ${{ steps.workflow-data.outputs.status }} for ${{ steps.workflow-data.outputs.report_type }} #${{ steps.workflow-data.outputs.pr_number }}",
               "blocks": [
                 {
                   "type": "header",
                   "text": {
                     "type": "plain_text",
-                    "text": "${{ steps.workflow-data.outputs.status_icon }} Github Action ${{ steps.workflow-data.outputs.status }} for PR #${{ steps.workflow-data.outputs.pr_number }}",
+                    "text": "${{ steps.workflow-data.outputs.status_icon }} Github Action ${{ steps.workflow-data.outputs.status }} for ${{ steps.workflow-data.outputs.report_type }} #${{ steps.workflow-data.outputs.pr_number }}",
                     "emoji": true
                   }
                 },
@@ -152,7 +167,7 @@ jobs:
                   "type": "section",
                   "text": {
                     "type": "mrkdwn",
-                    "text": "*PR Details:* \nAuthor: ${{ steps.workflow-data.outputs.pr_author }} \nName: <${{ steps.workflow-data.outputs.pr_number_url }} | ${{ steps.workflow-data.outputs.pr_title }}> \nNumber: #${{ steps.workflow-data.outputs.pr_number }} \nBranch: <${{ steps.workflow-data.outputs.branch_url }} | ${{ steps.workflow-data.outputs.branch }}>"
+                    "text": "*${{ steps.workflow-data.outputs.report_type }} Details:* \nAuthor: ${{ steps.workflow-data.outputs.pr_author }} \nName: <${{ steps.workflow-data.outputs.pr_number_url }} | ${{ steps.workflow-data.outputs.pr_title }}> \nNumber: #${{ steps.workflow-data.outputs.pr_number }} \nBranch: <${{ steps.workflow-data.outputs.branch_url }} | ${{ steps.workflow-data.outputs.branch }}>"
                   }
                 },
                 {
@@ -194,3 +209,64 @@ jobs:
             }
         env:
           SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+      - name: Post to a Slack channel non PR
+        if: steps.workflow-data.outputs.has-json == 'true' && steps.workflow-data.outputs.report_type != 'PR'
+        id: slack-non-pr
+        uses: slackapi/slack-github-action@v1.24.0
+        with:
+          channel-id: ${{ vars.SLACK_REPORT_CHANNEL }}
+          payload: |
+            {
+              "text": "Github Action ${{ steps.workflow-data.outputs.status }} for ${{ steps.workflow-data.outputs.report_type }} #${{ steps.workflow-data.outputs.branch }}",
+              "blocks": [
+                {
+                  "type": "header",
+                  "text": {
+                    "type": "plain_text",
+                    "text": "${{ steps.workflow-data.outputs.status_icon }} Github Action ${{ steps.workflow-data.outputs.status }} for ${{ steps.workflow-data.outputs.report_type }} #${{ steps.workflow-data.outputs.branch }}",
+                    "emoji": true
+                  }
+                },
+                {
+                  "type": "section",
+                  "text": {
+                    "type": "mrkdwn",
+                    "text": "*Action Run ID:* <${{ steps.workflow-data.outputs.action_run_url }} | ${{ steps.workflow-data.outputs.run_id }}> \n*Failure Step:* ${{ steps.workflow-data.outputs.first_fail_step }} \n*Failure Module:* ${{ steps.workflow-data.outputs.first_fail_module }}"
+                  }
+                },
+                {
+                  "type": "section",
+                  "text": {
+                    "type": "mrkdwn",
+                    "text": "*Failure Message:* ${{ steps.workflow-data.outputs.first_fail_error }}"
+                  }
+                },
+                {
+                  "type": "divider"
+                },
+                {
+                  "type": "header",
+                  "text": {
+                    "type": "plain_text",
+                    "text": "🧪 Test Results = ${{ steps.workflow-data.outputs.test_conclusion }}",
+                    "emoji": true
+                  }
+                },
+                {
+                  "type": "section",
+                  "text": {
+                    "type": "mrkdwn",
+                    "text": "*Passed:* ${{ steps.workflow-data.outputs.test_passed }} \n*Failed:* ${{ steps.workflow-data.outputs.test_failed }} \n*Skipped:* ${{ steps.workflow-data.outputs.test_skipped }} \n*Elapsed Time:* ${{ steps.workflow-data.outputs.test_elapsed }}"
+                  }
+                },
+                {
+                  "type": "section",
+                  "text": {
+                    "type": "mrkdwn",
+                    "text": "🔍 <${{ steps.workflow-data.outputs.test_results_url }} | View Test Results>"
+                  }
+                }
+              ]
+            }
+        env:
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
diff --git a/.github/workflows/core-cicd-tests.yml b/.github/workflows/core-cicd-tests.yml
@@ -8,7 +8,7 @@ on:
       - 'docker/**'
       - '!docker/dotcms-compose-examples/**'
       - 'dotCMS/**'
-      - '!dotCMS/src/main/webapp/html'
+      - '!dotCMS/src/main/webapp/html/**'
       - 'pom.xml'
       - 'tools/**'
   push: