Skip to content

Commit d25022b

Browse files
authored
[workflows] Stop using the build-test-llvm-project action (#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.
1 parent b4eb7a1 commit d25022b

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
@@ -98,14 +98,23 @@ jobs:
9898
key: ${{ matrix.os }}
9999
variant: sccache
100100
- name: Build and Test
101-
uses: llvm/actions/build-test-llvm-project@main
102101
env:
103102
# Workaround for https://github.com/actions/virtual-environments/issues/5900.
104103
# This should be a no-op for non-mac OSes
105104
PKG_CONFIG_PATH: /usr/local/Homebrew/Library/Homebrew/os/mac/pkgconfig//12
106-
with:
107-
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 }}'
108-
build_target: '${{ inputs.build_target }}'
105+
shell: bash
106+
run: |
107+
cmake -G Ninja \
108+
-B build \
109+
-S llvm \
110+
-DLLVM_ENABLE_PROJECTS="${{ inputs.projects }}" \
111+
-DCMAKE_BUILD_TYPE=Release \
112+
-DLLVM_ENABLE_ASSERTIONS=ON \
113+
-DLLDB_INCLUDE_TESTS=OFF \
114+
-DCMAKE_C_COMPILER_LAUNCHER=sccache \
115+
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
116+
${{ inputs.extra_cmake_args }}
117+
ninja -C build '${{ inputs.build_target }}'
109118
110119
- name: Build and Test libclc
111120
if: "!startsWith(matrix.os, 'windows') && contains(inputs.projects, 'libclc')"

0 commit comments

Comments
 (0)