Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change how libc++ specifies the runners to use. #74188

Merged
merged 1 commit into from
Dec 4, 2023

Conversation

EricWF
Copy link
Member

@EricWF EricWF commented Dec 2, 2023

Github actions has some quirks with how you use runner groups, labels,
names, etc... One of them is that groups can't "group" more than one set
of builders. To do that, you use the same name. So now we're specifying
the name.

Github actions has some quirks with how you use runner groups, labels,
names, etc... One of them is that groups can't "group" more than one set
of builders. To do that, you use the same name. So now we're specifying
the name.
@llvmbot
Copy link
Collaborator

llvmbot commented Dec 2, 2023

@llvm/pr-subscribers-github-workflow

Author: Eric (EricWF)

Changes

Github actions has some quirks with how you use runner groups, labels,
names, etc... One of them is that groups can't "group" more than one set
of builders. To do that, you use the same name. So now we're specifying
the name.


Full diff: https://github.com/llvm/llvm-project/pull/74188.diff

1 Files Affected:

  • (modified) .github/workflows/libcxx-build-and-test.yaml (+9-12)
diff --git a/.github/workflows/libcxx-build-and-test.yaml b/.github/workflows/libcxx-build-and-test.yaml
index 018f0e45a2441ef..83786052a539106 100644
--- a/.github/workflows/libcxx-build-and-test.yaml
+++ b/.github/workflows/libcxx-build-and-test.yaml
@@ -50,8 +50,7 @@ env:
 jobs:
   stage1:
     if: github.repository_owner == 'llvm'
-    runs-on:
-      group: libcxx-runners-8
+    runs-on: libcxx-runners-8-set
     continue-on-error: false
     strategy:
       fail-fast: true
@@ -89,8 +88,7 @@ jobs:
             **/crash_diagnostics/*
   stage2:
     if: github.repository_owner == 'llvm'
-    runs-on:
-      group: libcxx-runners-8
+    runs-on: libcxx-runners-8-set
     needs: [ stage1 ]
     continue-on-error: false
     strategy:
@@ -169,27 +167,26 @@ jobs:
           'benchmarks',
           'bootstrapping-build'
         ]
-        machine: [ 'libcxx-runners-8' ]
+        machine: [ 'libcxx-runners-8-set' ]
         std_modules: [ 'OFF' ]
         include:
         - config: 'generic-cxx26'
-          machine: libcxx-runners-8
+          machine: libcxx-runners-8-set
           std_modules: 'ON'
         - config: 'generic-asan'
-          machine: libcxx-runners-8
+          machine: libcxx-runners-8-set
           std_modules: 'OFF'
         - config: 'generic-tsan'
-          machine: libcxx-runners-8
+          machine: libcxx-runners-8-set
           std_modules: 'OFF'
         - config: 'generic-ubsan'
-          machine: libcxx-runners-8
+          machine: libcxx-runners-8-set
           std_modules: 'OFF'
         # Use a larger machine for MSAN to avoid timeout and memory allocation issues.
         - config: 'generic-msan'
-          machine: libcxx-runners-32
+          machine: libcxx-runners-32-set
           std_modules: 'OFF'
-    runs-on:
-      group: ${{ matrix.machine }}
+    runs-on: ${{ matrix.machine }}
     steps:
       - uses: actions/checkout@v4
       - name: ${{ matrix.config }}

@EricWF
Copy link
Member Author

EricWF commented Dec 4, 2023

I'm going to go ahead and merge this so I can have better failover behavior for the bots.

@EricWF EricWF merged commit 4596dd1 into llvm:main Dec 4, 2023
39 of 43 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants