Changeset 3d5701e for Jenkins/FullBuild

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

• Jenkins/FullBuild (modified) (1 diff)

Jenkins/FullBuild

@@ -17 +17 @@
 
                                 parallel (
+                                        clang_x86: { trigger_build( 'gcc-8',   'x86' ) },
+                                        gcc_5_x86: { trigger_build( 'gcc-7',   'x86' ) },
+                                        gcc_6_x86: { trigger_build( 'gcc-6',   'x86' ) },
+                                        gcc_9_x64: { trigger_build( 'gcc-9',   'x64' ) },
+                                        gcc_8_x64: { trigger_build( 'gcc-8',   'x64' ) },
+                                        gcc_7_x64: { trigger_build( 'gcc-7',   'x64' ) },
                                         gcc_6_x64: { trigger_build( 'gcc-6',   'x64' ) },
-                                        gcc_6_x86: { trigger_build( 'gcc-6',   'x86' ) },
                                         gcc_5_x64: { trigger_build( 'gcc-5',   'x64' ) },
-                                        gcc_5_x86: { trigger_build( 'gcc-5',   'x86' ) },
                                         clang_x64: { trigger_build( 'clang',   'x64' ) },
-                                        clang_x86: { trigger_build( 'clang',   'x86' ) },
                                 )
                         }