From 87b4490b3c8780fad54ba9afdffec43c628c7a74 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2@gmail.com>
Date: Wed, 29 Sep 2021 13:42:55 -0400
Subject: [PATCH] [libc++][NFC] Reorganize CI jobs into commented sections

---
 libcxx/utils/ci/buildkite-pipeline.yml | 71 +++++++++++++++++++---------------
 1 file changed, 39 insertions(+), 32 deletions(-)

diff --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml
index 39afd70..098aef7 100644
--- a/libcxx/utils/ci/buildkite-pipeline.yml
+++ b/libcxx/utils/ci/buildkite-pipeline.yml
@@ -113,6 +113,7 @@ steps:
         - exit_status: -1  # Agent was lost
           limit: 2
     timeout_in_minutes: 120
+
   - label: "C++11"
     command: "libcxx/utils/ci/run-buildbot generic-cxx11"
     artifact_paths:
@@ -159,6 +160,7 @@ steps:
   #
   - wait
 
+  # Tests with the supported compilers.
   - label: "GCC 11 / C++11"
     command: "libcxx/utils/ci/run-buildbot generic-gcc-cxx11"
     artifact_paths:
@@ -198,8 +200,9 @@ steps:
           limit: 2
     timeout_in_minutes: 120
 
-  - label: "-fno-exceptions"
-    command: "libcxx/utils/ci/run-buildbot generic-noexceptions"
+  # Tests with the sanitizers.
+  - label: "ASAN"
+    command: "libcxx/utils/ci/run-buildbot generic-asan"
     artifact_paths:
       - "**/test-results.xml"
     agents:
@@ -211,8 +214,8 @@ steps:
           limit: 2
     timeout_in_minutes: 120
 
-  - label: "Modular build"
-    command: "libcxx/utils/ci/run-buildbot generic-modules"
+  - label: "TSAN"
+    command: "libcxx/utils/ci/run-buildbot generic-tsan"
     artifact_paths:
       - "**/test-results.xml"
     agents:
@@ -224,8 +227,8 @@ steps:
           limit: 2
     timeout_in_minutes: 120
 
-  - label: "Static libraries"
-    command: "libcxx/utils/ci/run-buildbot generic-static"
+  - label: "UBSAN"
+    command: "libcxx/utils/ci/run-buildbot generic-ubsan"
     artifact_paths:
       - "**/test-results.xml"
     agents:
@@ -237,11 +240,11 @@ steps:
           limit: 2
     timeout_in_minutes: 120
 
-  - label: "Assertions enabled"
-    command: "libcxx/utils/ci/run-buildbot generic-assertions"
+  # Tests with various build configurations.
+  - label: "-fno-exceptions"
+    command: "libcxx/utils/ci/run-buildbot generic-noexceptions"
     artifact_paths:
       - "**/test-results.xml"
-      - "**/*.abilist"
     agents:
       queue: "libcxx-builders"
       os: "linux"
@@ -251,11 +254,10 @@ steps:
           limit: 2
     timeout_in_minutes: 120
 
-  - label: "Debug iterators"
-    command: "libcxx/utils/ci/run-buildbot generic-debug-iterators"
+  - label: "Modular build"
+    command: "libcxx/utils/ci/run-buildbot generic-modules"
     artifact_paths:
       - "**/test-results.xml"
-      - "**/*.abilist"
     agents:
       queue: "libcxx-builders"
       os: "linux"
@@ -265,8 +267,8 @@ steps:
           limit: 2
     timeout_in_minutes: 120
 
-  - label: "ASAN"
-    command: "libcxx/utils/ci/run-buildbot generic-asan"
+  - label: "Static libraries"
+    command: "libcxx/utils/ci/run-buildbot generic-static"
     artifact_paths:
       - "**/test-results.xml"
     agents:
@@ -278,10 +280,11 @@ steps:
           limit: 2
     timeout_in_minutes: 120
 
-  - label: "TSAN"
-    command: "libcxx/utils/ci/run-buildbot generic-tsan"
+  - label: "Assertions enabled"
+    command: "libcxx/utils/ci/run-buildbot generic-assertions"
     artifact_paths:
       - "**/test-results.xml"
+      - "**/*.abilist"
     agents:
       queue: "libcxx-builders"
       os: "linux"
@@ -291,10 +294,11 @@ steps:
           limit: 2
     timeout_in_minutes: 120
 
-  - label: "UBSAN"
-    command: "libcxx/utils/ci/run-buildbot generic-ubsan"
+  - label: "Debug iterators"
+    command: "libcxx/utils/ci/run-buildbot generic-debug-iterators"
     artifact_paths:
       - "**/test-results.xml"
+      - "**/*.abilist"
     agents:
       queue: "libcxx-builders"
       os: "linux"
@@ -317,6 +321,19 @@ steps:
           limit: 2
     timeout_in_minutes: 120
 
+  - label: "32 bit"
+    command: "libcxx/utils/ci/run-buildbot generic-32bit"
+    artifact_paths:
+      - "**/test-results.xml"
+    agents:
+      queue: "libcxx-builders"
+      os: "linux"
+    retry:
+      automatic:
+        - exit_status: -1  # Agent was lost
+          limit: 2
+    timeout_in_minutes: 120
+
   - label: "Single-threaded"
     command: "libcxx/utils/ci/run-buildbot generic-singlethreaded"
     artifact_paths:
@@ -343,7 +360,7 @@ steps:
           limit: 2
     timeout_in_minutes: 120
 
-  - label: "No Filesystem"
+  - label: "No filesystem"
     command: "libcxx/utils/ci/run-buildbot generic-no-filesystem"
     artifact_paths:
       - "**/test-results.xml"
@@ -395,6 +412,7 @@ steps:
           limit: 2
     timeout_in_minutes: 120
 
+  # Other non-testing CI jobs
   - label: "Benchmarks"
     command: "libcxx/utils/ci/run-buildbot benchmarks"
     artifact_paths:
@@ -421,6 +439,7 @@ steps:
           limit: 2
     timeout_in_minutes: 120
 
+  # Tests with the various supported ways to build libc++.
   - label: "Legacy Lit configuration"
     command: "libcxx/utils/ci/run-buildbot legacy-test-config"
     artifact_paths:
@@ -473,6 +492,7 @@ steps:
           limit: 2
     timeout_in_minutes: 120
 
+  # Tests on non-Unix platforms
   - label: "Windows (DLL)"
     command: "bash libcxx/utils/ci/run-buildbot windows-dll"
     artifact_paths:
@@ -497,19 +517,6 @@ steps:
           limit: 2
     timeout_in_minutes: 120
 
-  - label: "32 bit"
-    command: "libcxx/utils/ci/run-buildbot generic-32bit"
-    artifact_paths:
-      - "**/test-results.xml"
-    agents:
-      queue: "libcxx-builders"
-      os: "linux"
-    retry:
-      automatic:
-        - exit_status: -1  # Agent was lost
-          limit: 2
-    timeout_in_minutes: 120
-
   - label: "MacOS x86_64"
     command: "libcxx/utils/ci/run-buildbot generic-cxx20"
     artifact_paths:
-- 
2.7.4