[llvm] [libc++][WIP] Try to target a runner group directly (PR #116299)

Louis Dionne via llvm-commits llvm-commits at lists.llvm.org
Thu Nov 14 15:43:25 PST 2024


https://github.com/ldionne updated https://github.com/llvm/llvm-project/pull/116299

>From c86afc442bba72097e93862f81ec209cabcdc643 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2 at gmail.com>
Date: Fri, 15 Nov 2024 00:39:01 +0100
Subject: [PATCH 1/3] [libc++][WIP] Try to target a runner group directly

---
 .github/workflows/libcxx-build-and-test.yaml | 21 +++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/libcxx-build-and-test.yaml b/.github/workflows/libcxx-build-and-test.yaml
index 91b929732f2808..1b663f530c75e2 100644
--- a/.github/workflows/libcxx-build-and-test.yaml
+++ b/.github/workflows/libcxx-build-and-test.yaml
@@ -49,7 +49,8 @@ env:
 jobs:
   stage1:
     if: github.repository_owner == 'llvm'
-    runs-on: libcxx-runners-set
+    runs-on:
+      group: fozzie-runners-1
     container: ghcr.io/libcxx/actions-builder:testing-2024-09-21
     continue-on-error: false
     strategy:
@@ -86,7 +87,8 @@ jobs:
             **/crash_diagnostics/*
   stage2:
     if: github.repository_owner == 'llvm'
-    runs-on: libcxx-runners-set
+    runs-on:
+      group: fozzie-runners-1
     container: ghcr.io/libcxx/actions-builder:testing-2024-09-21
     needs: [ stage1 ]
     continue-on-error: false
@@ -161,20 +163,21 @@ jobs:
           'generic-static',
           'bootstrapping-build'
         ]
-        machine: [ 'libcxx-runners-set' ]
+        machine: [ 'fozzie-runners-1' ]
         include:
         - config: 'generic-cxx26'
-          machine: libcxx-runners-set
+          machine: fozzie-runners-1
         - config: 'generic-asan'
-          machine: libcxx-runners-set
+          machine: fozzie-runners-1
         - config: 'generic-tsan'
-          machine: libcxx-runners-set
+          machine: fozzie-runners-1
         - config: 'generic-ubsan'
-          machine: libcxx-runners-set
+          machine: fozzie-runners-1
         # Use a larger machine for MSAN to avoid timeout and memory allocation issues.
         - config: 'generic-msan'
-          machine: libcxx-runners-set
-    runs-on: ${{ matrix.machine }}
+          machine: fozzie-runners-1
+    runs-on:
+      group: ${{ matrix.machine }}
     container: ghcr.io/libcxx/actions-builder:testing-2024-09-21
     steps:
       - uses: actions/checkout at v4

>From b60d7c2d651324cfec9bbba7b4c12646065667f2 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2 at gmail.com>
Date: Fri, 15 Nov 2024 00:42:43 +0100
Subject: [PATCH 2/3] Revert "[libc++][WIP] Try to target a runner group
 directly"

This reverts commit c86afc442bba72097e93862f81ec209cabcdc643.
---
 .github/workflows/libcxx-build-and-test.yaml | 21 +++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/libcxx-build-and-test.yaml b/.github/workflows/libcxx-build-and-test.yaml
index 1b663f530c75e2..91b929732f2808 100644
--- a/.github/workflows/libcxx-build-and-test.yaml
+++ b/.github/workflows/libcxx-build-and-test.yaml
@@ -49,8 +49,7 @@ env:
 jobs:
   stage1:
     if: github.repository_owner == 'llvm'
-    runs-on:
-      group: fozzie-runners-1
+    runs-on: libcxx-runners-set
     container: ghcr.io/libcxx/actions-builder:testing-2024-09-21
     continue-on-error: false
     strategy:
@@ -87,8 +86,7 @@ jobs:
             **/crash_diagnostics/*
   stage2:
     if: github.repository_owner == 'llvm'
-    runs-on:
-      group: fozzie-runners-1
+    runs-on: libcxx-runners-set
     container: ghcr.io/libcxx/actions-builder:testing-2024-09-21
     needs: [ stage1 ]
     continue-on-error: false
@@ -163,21 +161,20 @@ jobs:
           'generic-static',
           'bootstrapping-build'
         ]
-        machine: [ 'fozzie-runners-1' ]
+        machine: [ 'libcxx-runners-set' ]
         include:
         - config: 'generic-cxx26'
-          machine: fozzie-runners-1
+          machine: libcxx-runners-set
         - config: 'generic-asan'
-          machine: fozzie-runners-1
+          machine: libcxx-runners-set
         - config: 'generic-tsan'
-          machine: fozzie-runners-1
+          machine: libcxx-runners-set
         - config: 'generic-ubsan'
-          machine: fozzie-runners-1
+          machine: libcxx-runners-set
         # Use a larger machine for MSAN to avoid timeout and memory allocation issues.
         - config: 'generic-msan'
-          machine: fozzie-runners-1
-    runs-on:
-      group: ${{ matrix.machine }}
+          machine: libcxx-runners-set
+    runs-on: ${{ matrix.machine }}
     container: ghcr.io/libcxx/actions-builder:testing-2024-09-21
     steps:
       - uses: actions/checkout at v4

>From e5ad77480adcac68c3243ebbe50fe28f6aadefd7 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2 at gmail.com>
Date: Fri, 15 Nov 2024 00:43:13 +0100
Subject: [PATCH 3/3] Try libcxx-runners-8-set

---
 .github/workflows/libcxx-build-and-test.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/libcxx-build-and-test.yaml b/.github/workflows/libcxx-build-and-test.yaml
index 91b929732f2808..76dfd2f9afb2ec 100644
--- a/.github/workflows/libcxx-build-and-test.yaml
+++ b/.github/workflows/libcxx-build-and-test.yaml
@@ -49,7 +49,7 @@ env:
 jobs:
   stage1:
     if: github.repository_owner == 'llvm'
-    runs-on: libcxx-runners-set
+    runs-on: libcxx-runners-8-set
     container: ghcr.io/libcxx/actions-builder:testing-2024-09-21
     continue-on-error: false
     strategy:
@@ -86,7 +86,7 @@ jobs:
             **/crash_diagnostics/*
   stage2:
     if: github.repository_owner == 'llvm'
-    runs-on: libcxx-runners-set
+    runs-on: libcxx-runners-8-set
     container: ghcr.io/libcxx/actions-builder:testing-2024-09-21
     needs: [ stage1 ]
     continue-on-error: false
@@ -161,19 +161,19 @@ jobs:
           'generic-static',
           'bootstrapping-build'
         ]
-        machine: [ 'libcxx-runners-set' ]
+        machine: [ 'libcxx-runners-8-set' ]
         include:
         - config: 'generic-cxx26'
-          machine: libcxx-runners-set
+          machine: libcxx-runners-8-set
         - config: 'generic-asan'
-          machine: libcxx-runners-set
+          machine: libcxx-runners-8-set
         - config: 'generic-tsan'
-          machine: libcxx-runners-set
+          machine: libcxx-runners-8-set
         - config: 'generic-ubsan'
-          machine: libcxx-runners-set
+          machine: libcxx-runners-8-set
         # Use a larger machine for MSAN to avoid timeout and memory allocation issues.
         - config: 'generic-msan'
-          machine: libcxx-runners-set
+          machine: libcxx-runners-8-set
     runs-on: ${{ matrix.machine }}
     container: ghcr.io/libcxx/actions-builder:testing-2024-09-21
     steps:



More information about the llvm-commits mailing list