Skip to content

Commit 0b501e9

Browse files
committed
[workflows] Stop using the build-test-llvm-project action (llvm#80580)
This action is really just a wrapper around cmake and ninja. It doesn't add any value to the builds, and I don't think we need it now that there are reusable workflows. (cherry picked from commit d25022b)
1 parent 8e1c880 commit 0b501e9

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,23 @@ jobs:
9999
key: ${{ matrix.os }}
100100
variant: sccache
101101
- name: Build and Test
102-
uses: llvm/actions/build-test-llvm-project@main
103102
env:
104103
# Workaround for https://github.com/actions/virtual-environments/issues/5900.
105104
# This should be a no-op for non-mac OSes
106105
PKG_CONFIG_PATH: /usr/local/Homebrew/Library/Homebrew/os/mac/pkgconfig//12
107-
with:
108-
cmake_args: '-GNinja -DLLVM_ENABLE_PROJECTS="${{ inputs.projects }}" -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLDB_INCLUDE_TESTS=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache ${{ inputs.extra_cmake_args }}'
109-
build_target: '${{ inputs.build_target }}'
106+
shell: bash
107+
run: |
108+
cmake -G Ninja \
109+
-B build \
110+
-S llvm \
111+
-DLLVM_ENABLE_PROJECTS="${{ inputs.projects }}" \
112+
-DCMAKE_BUILD_TYPE=Release \
113+
-DLLVM_ENABLE_ASSERTIONS=ON \
114+
-DLLDB_INCLUDE_TESTS=OFF \
115+
-DCMAKE_C_COMPILER_LAUNCHER=sccache \
116+
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
117+
${{ inputs.extra_cmake_args }}
118+
ninja -C build '${{ inputs.build_target }}'
110119
111120
- name: Build and Test libclc
112121
if: "!startsWith(matrix.os, 'windows') && contains(inputs.projects, 'libclc')"

0 commit comments

Comments
 (0)