Skip to content

Commit 12a3c8c

Browse files
committed
[SOL] Fix LLVM 19 CI
1 parent ad714ac commit 12a3c8c

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,6 @@ jobs:
7878
# We're using a specific version of macOS due to:
7979
# https://github.com/actions/virtual-environments/issues/5900
8080
- macOS-latest
81-
include:
82-
- compile_cache: sccache
83-
84-
- compile_cache: ccache
85-
os: macos-latest
8681
steps:
8782
- name: Setup Windows
8883
if: startsWith(matrix.os, 'windows')
@@ -106,7 +101,7 @@ jobs:
106101
- uses: actions/checkout@v4
107102
with:
108103
fetch-depth: 250
109-
- name: Setup ${{ matrix.compile_cache }}
104+
- name: Setup ccache
110105
uses: hendrikmuhs/ccache-action@v1
111106
with:
112107
# A full build of llvm, clang, lld, and lldb takes about 250MB
@@ -118,8 +113,8 @@ jobs:
118113
# fit under the 10 GB limit.
119114
# Default to 2G to workaround: https://github.com/hendrikmuhs/ccache-action/issues/174
120115
max-size: 2G
121-
key: ${{ matrix.compile_cache }}-${{ matrix.os }}
122-
variant: ${{ matrix.compile_cache }}
116+
key: ${{ matrix.os }}
117+
variant: sccache
123118
- name: Build and Test
124119
if: "!startsWith(matrix.os, 'windows')"
125120
env:
@@ -160,6 +155,8 @@ jobs:
160155
161156
- name: Build and Test libclc
162157
if: "!startsWith(matrix.os, 'windows') && !startsWith(matrix.os, 'macOS') && contains(inputs.projects, 'libclc')"
158+
env:
159+
LLVM_BUILDDIR: ${{ steps.build-llvm.outputs.llvm-builddir }}
163160
run: |
164161
# The libclc tests don't have a generated check target so all we can
165162
# do is build it.

0 commit comments

Comments
 (0)