Skip to content

Commit

Permalink
workflows: Merge LLVM tests together into a single job (llvm#78877)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
tstellar authored Jan 27, 2024
1 parent 7c03d5d commit 53fea6f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 26 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/llvm-project-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -95,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
Expand Down
24 changes: 3 additions & 21 deletions .github/workflows/llvm-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit 53fea6f

Please sign in to comment.