Changeset bd72f517 for Jenkinsfile

Timestamp:

May 13, 2025, 1:17:50 PM (4 months ago)

Author:

Mike Brooks <mlbrooks@…>

Branches:

master

Children:

0528d79

Parents:

7d02d35 (diff), 2410424 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• Jenkinsfile (modified) (4 diffs)

Jenkinsfile

@@ -290 +290 @@
         BuildSettings(java.util.Collections$UnmodifiableMap param, String branch) {
                 switch( param.Compiler ) {
-                        case 'gcc-11':
-                                this.Compiler = new CC_Desc('gcc-11', 'g++-11', 'gcc-11', '-flto=auto')
-                        break
-                        case 'gcc-10':
-                                this.Compiler = new CC_Desc('gcc-10', 'g++-10', 'gcc-10', '-flto=auto')
-                        break
-                        case 'gcc-9':
-                                this.Compiler = new CC_Desc('gcc-9', 'g++-9', 'gcc-9', '-flto=auto')
-                        break
-                        case 'gcc-8':
-                                this.Compiler = new CC_Desc('gcc-8', 'g++-8', 'gcc-8', '-flto=auto')
-                        break
-                        case 'gcc-7':
-                                this.Compiler = new CC_Desc('gcc-7', 'g++-7', 'gcc-7', '-flto=auto')
-                        break
-                        // case 'gcc-6':
-                        //      this.Compiler = new CC_Desc('gcc-6', 'g++-6', 'gcc-6', '-flto=auto')
+                        // case 'gcc-4.9':
+                        //      this.Compiler = new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9', '-flto=auto')
                         // break
                         // case 'gcc-5':
                         //      this.Compiler = new CC_Desc('gcc-5', 'g++-5', 'gcc-5', '-flto=auto')
                         // break
-                        // case 'gcc-4.9':
-                        //      this.Compiler = new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9', '-flto=auto')
+                        // case 'gcc-6':
+                        //      this.Compiler = new CC_Desc('gcc-6', 'g++-6', 'gcc-6', '-flto=auto')
                         // break
+                        case 'gcc-7':
+                                this.Compiler = new CC_Desc('gcc-7', 'g++-7', 'gcc-7', '-flto=auto')
+                        break
+                        case 'gcc-8':
+                                this.Compiler = new CC_Desc('gcc-8', 'g++-8', 'gcc-8', '-flto=auto')
+                        break
+                        case 'gcc-9':
+                                this.Compiler = new CC_Desc('gcc-9', 'g++-9', 'gcc-9', '-flto=auto')
+                        break
+                        case 'gcc-10':
+                                this.Compiler = new CC_Desc('gcc-10', 'g++-10', 'gcc-10', '-flto=auto')
+                        break
+                        case 'gcc-11':
+                                this.Compiler = new CC_Desc('gcc-11', 'g++-11', 'gcc-11', '-flto=auto')
+                        break
+                        case 'gcc-12':
+                                this.Compiler = new CC_Desc('gcc-12', 'g++-12', 'gcc-12', '-flto=auto')
+                        break
                         case 'clang':
                                 this.Compiler = new CC_Desc('clang', 'clang++-10', 'gcc-10', '-flto=thin -flto-jobs=0')
@@ -325 +328 @@
                                 this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'x64')
                         break
-                        case 'x86':
-                                this.Architecture = new Arch_Desc('x86', '--host=i386', 'x86')
-                        break
-                        case 'arm64':
-                                this.Architecture = new Arch_Desc('arm64', '--host=aarch64', 'arm64')
-                        break
+                        //case 'x86':
+                        //      this.Architecture = new Arch_Desc('x86', '--host=i386', 'x86')
+                        //break
+                        // case 'arm64':
+                        //      this.Architecture = new Arch_Desc('arm64', '--host=aarch64', 'arm64')
+                        // break
                         default :
                                 error "Unhandled architecture : ${arch}"
@@ -374 +377 @@
                                         description: 'Which compiler to use',                   \
                                         name: 'Compiler',                                       \
-                                        choices: 'gcc-11\ngcc-10\ngcc-9\ngcc-8\ngcc-7\nclang',  \
+                                        choices: 'gcc-7\ngcc-8\ngcc-9\ngcc-10\ngcc-11\ngcc-12\nclang',  \
                                         defaultValue: 'gcc-9',                                  \
                                 ],                                                              \
@@ -410 +413 @@
                         ],
                 ]])
-                                        // choices: 'gcc-11\ngcc-10\ngcc-9\ngcc-8\ngcc-7\ngcc-6\ngcc-5\ngcc-4.9\nclang',
+                                        // choices: 'gcc-4.9\ngcc-5\ngcc-6\ngcc-7\ngcc-8\ngcc-9\ngcc-10\ngcc-11\nclang',
                                         // defaultValue: 'gcc-8',