Skip to content

Commit ddbdd7b

Browse files
authored
workflows: Merge LLVM tests together into a single job (#78877) (#79710)
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.
1 parent fa0a72b commit ddbdd7b

File tree

2 files changed

+7
-26
lines changed

2 files changed

+7
-26
lines changed

.github/workflows/llvm-project-tests.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
required: false
1515
os_list:
1616
required: false
17-
default: '["ubuntu-latest", "windows-2019", "macOS-11"]'
17+
default: '["ubuntu-latest", "windows-2019", "macOS-13"]'
1818
python_version:
1919
required: false
2020
type: string
@@ -38,9 +38,7 @@ on:
3838
type: string
3939
# Use windows-2019 due to:
4040
# https://developercommunity.visualstudio.com/t/Prev-Issue---with-__assume-isnan-/1597317
41-
# We're using a specific version of macOS due to:
42-
# https://github.com/actions/virtual-environments/issues/5900
43-
default: '["ubuntu-latest", "windows-2019", "macOS-11"]'
41+
default: '["ubuntu-latest", "windows-2019", "macOS-13"]'
4442

4543
python_version:
4644
required: false
@@ -95,7 +93,8 @@ jobs:
9593
# run creates a new cache entry so we want to ensure that we have
9694
# enough cache space for all the tests to run at once and still
9795
# fit under the 10 GB limit.
98-
max-size: 500M
96+
# Default to 2G to workaround: https://github.com/hendrikmuhs/ccache-action/issues/174
97+
max-size: 2G
9998
key: ${{ matrix.os }}
10099
variant: sccache
101100
- name: Build and Test

.github/workflows/llvm-tests.yml

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,13 @@ concurrency:
2727
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
2828

2929
jobs:
30-
check_all:
30+
check-all:
3131
if: github.repository_owner == 'llvm'
32-
name: Test llvm,clang,libclc
32+
name: Build and Test
3333
uses: ./.github/workflows/llvm-project-tests.yml
3434
with:
3535
build_target: check-all
36-
projects: clang;libclc
37-
38-
# These need to be separate from the check_all job, becuase there is not enough disk
39-
# space to build all these projects on Windows.
40-
build_lldb:
41-
if: github.repository_owner == 'llvm'
42-
name: Build lldb
43-
uses: ./.github/workflows/llvm-project-tests.yml
44-
with:
45-
build_target: ''
46-
projects: clang;lldb
47-
48-
check_lld:
49-
if: github.repository_owner == 'llvm'
50-
name: Test lld
51-
uses: ./.github/workflows/llvm-project-tests.yml
52-
with:
53-
build_target: check-lld
54-
projects: lld
36+
projects: clang;lld;libclc;lldb
5537

5638
abi-dump-setup:
5739
if: github.repository_owner == 'llvm'

0 commit comments

Comments
 (0)