Changeset 9824500

Timestamp:

Jun 14, 2021, 3:47:17 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

a8b0618

Parents:

733fd3d

Message:

Fixed email generation in Jenkins

Files:

• Jenkins/tools.groovy (modified) (1 diff)
• Jenkinsfile (modified) (1 diff)

Jenkins/tools.groovy

@@ -83 +83 @@
 
         return """
+<p>- Changes -------------------------------------------------------------</p>
+
 <pre>
 The branch ${env.BRANCH_NAME} has been updated.
 ${gitUpdate}
 </pre>
-
-<p>Check console output at ${env.BUILD_URL} to view the results.</p>
-
-<p>- Status --------------------------------------------------------------</p>
-
-<p>BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}</p>
 
 <p>- Log -----------------------------------------------------------------</p>

Jenkinsfile

@@ -234 +234 @@
                 def email_subject = "[${project_name} git][BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}] - branch ${env.BRANCH_NAME}"
                 def email_body = """<p>This is an automated email from the Jenkins build machine. It was
-        generated because of a git hooks/post-receive script following
-        a ref change which was pushed to the C\u2200 repository.</p>
-        """ + Tools.GitLogMessage()
+                        generated because of a git hooks/post-receive script following
+                        a ref change which was pushed to the C\u2200 repository.</p>
+
+                        <p>- Status --------------------------------------------------------------</p>
+
+                        <p>BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}</p>
+                        <p>Check console output at ${env.BUILD_URL} to view the results.</p>
+                        """ + Tools.GitLogMessage()
 
                 def email_to = !Settings.IsSandbox ? "cforall@lists.uwaterloo.ca" : "tdelisle@uwaterloo.ca"