Update cicd_manual_publish-starter.yml

dotCMS · Sep 20, 2024 · f4189e6 · f4189e6
1 parent 19be989
commit f4189e6
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/.github/workflows/cicd_manual_publish-starter.yml b/.github/workflows/cicd_manual_publish-starter.yml
@@ -216,27 +216,28 @@ jobs:
           ARTIFACT_URL="${{ needs.deploy-artifacts.outputs.url }}"
           CHANGELOG="${{ github.event.inputs.changelog }}"
           PULL_REQUEST_URL="${{ needs.update-pom.outputs.pull-request-url }}"
+
+          if [ "$STARTER_TYPE" == "empty" ]; then
+            PR_ALERT=$(cat <<-EOF
+            >
+            > :bangbang: Approvals required to apply the latest version of *_Empty Starter_* to the project.
+            > :globe_with_meridians: ${PULL_REQUEST_URL}
+            EOF
+            )
+          fi          
           
           BASE_MESSAGE=$(cat <<-EOF
           > :large_green_circle: *Attention dotters:* a new Starter published!
           > This automated script is happy to announce that a new *_${STARTER_TYPE} starter_* :package: \`${ARTIFACT_FILENAME}\` is now available on \`ARTIFACTORY\` :frog:!
           >
           > :link: ${ARTIFACT_URL}
           > *Changelog*
-          > \`\`\`${CHANGELOG}\`\`\`          
+          > \`\`\`${CHANGELOG}\`\`\`
+          ${PR_ALERT}
           EOF
           )
-
-          if [ "$STARTER_TYPE" == "empty" ]; then
-            PR_ALERT=$(cat <<-EOF
-            >
-            > :bangbang: Approvals required to apply the latest version of *_Empty Starter_* to the project.
-            > :globe_with_meridians: ${PULL_REQUEST_URL}
-            EOF
-            )
-          fi
           
-          MESSAGE="${BASE_MESSAGE}${PR_ALERT}"
+          MESSAGE="${BASE_MESSAGE}"
           
           echo "Message: ${MESSAGE}"
           echo "message<<EOF" >> $GITHUB_OUTPUT