[llvm] workflows: Merge LLVM tests together into a single job (PR #78877)
Tom Stellard via llvm-commits
llvm-commits at lists.llvm.org
Fri Jan 26 13:18:10 PST 2024
https://github.com/tstellar updated https://github.com/llvm/llvm-project/pull/78877
>From ef5b18c28458896d6388314bed2b17da2d669c0b Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Fri, 19 Jan 2024 14:38:54 -0800
Subject: [PATCH 1/2] workflows: Merge LLVM tests together into a single job
This is possible now that the free GitHub runners for Windows and Linux
have more disk space:
https://github.blog/2024-01-17-github-hosted-runners-double-the-power-for-open-source/
I also had to switch from macOS-11 to macOS-13 in order to prevent the
job from timing out. macOS-13 runners have 4 vCPUs and the macOS-11
runners only have 3.
---
.github/workflows/llvm-project-tests.yml | 6 ++----
.github/workflows/llvm-tests.yml | 24 +++---------------------
2 files changed, 5 insertions(+), 25 deletions(-)
diff --git a/.github/workflows/llvm-project-tests.yml b/.github/workflows/llvm-project-tests.yml
index a1404e1f1efa95..481d518fd4b8b7 100644
--- a/.github/workflows/llvm-project-tests.yml
+++ b/.github/workflows/llvm-project-tests.yml
@@ -14,7 +14,7 @@ on:
required: false
os_list:
required: false
- default: '["ubuntu-latest", "windows-2019", "macOS-11"]'
+ default: '["ubuntu-latest", "windows-2019", "macOS-13"]'
python_version:
required: false
type: string
@@ -38,9 +38,7 @@ on:
type: string
# Use windows-2019 due to:
# https://developercommunity.visualstudio.com/t/Prev-Issue---with-__assume-isnan-/1597317
- # We're using a specific version of macOS due to:
- # https://github.com/actions/virtual-environments/issues/5900
- default: '["ubuntu-latest", "windows-2019", "macOS-11"]'
+ default: '["ubuntu-latest", "windows-2019", "macOS-13"]'
python_version:
required: false
diff --git a/.github/workflows/llvm-tests.yml b/.github/workflows/llvm-tests.yml
index cc9855ce182b2b..63f0f3abfd70a5 100644
--- a/.github/workflows/llvm-tests.yml
+++ b/.github/workflows/llvm-tests.yml
@@ -27,31 +27,13 @@ concurrency:
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
jobs:
- check_all:
+ check-all:
if: github.repository_owner == 'llvm'
- name: Test llvm,clang,libclc
+ name: Build and Test
uses: ./.github/workflows/llvm-project-tests.yml
with:
build_target: check-all
- projects: clang;libclc
-
- # These need to be separate from the check_all job, becuase there is not enough disk
- # space to build all these projects on Windows.
- build_lldb:
- if: github.repository_owner == 'llvm'
- name: Build lldb
- uses: ./.github/workflows/llvm-project-tests.yml
- with:
- build_target: ''
- projects: clang;lldb
-
- check_lld:
- if: github.repository_owner == 'llvm'
- name: Test lld
- uses: ./.github/workflows/llvm-project-tests.yml
- with:
- build_target: check-lld
- projects: lld
+ projects: clang;lld;libclc;lldb
abi-dump-setup:
if: github.repository_owner == 'llvm'
>From 455655535212e03800c7531092f577d1094cb6ab Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Fri, 26 Jan 2024 13:18:02 -0800
Subject: [PATCH 2/2] Update llvm-project-tests.yml
---
.github/workflows/llvm-project-tests.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/llvm-project-tests.yml b/.github/workflows/llvm-project-tests.yml
index 481d518fd4b8b7..91d0b258394ef7 100644
--- a/.github/workflows/llvm-project-tests.yml
+++ b/.github/workflows/llvm-project-tests.yml
@@ -93,7 +93,8 @@ jobs:
# run creates a new cache entry so we want to ensure that we have
# enough cache space for all the tests to run at once and still
# fit under the 10 GB limit.
- max-size: 500M
+ # Default to 2G to workaround: https://github.com/hendrikmuhs/ccache-action/issues/174
+ max-size: 2G
key: ${{ matrix.os }}
variant: sccache
- name: Build and Test
More information about the llvm-commits
mailing list