Skip to content

Commit 1c50801

Browse files
committed
Switch back to upstream LLVM on Make
We need something that tests this, anyway
1 parent 6c21dd3 commit 1c50801

1 file changed

Lines changed: 18 additions & 7 deletions

File tree

.github/workflows/testing-make.yml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,28 @@ jobs:
5656
- name: Install dependencies
5757
run: |
5858
if [ "$RUNNER_OS" = "Linux" ]; then
59-
sudo apt-get install -y pkg-config libpng-dev libjpeg-turbo8-dev
59+
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
60+
echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-${LLVM_VERSION} main" | \
61+
sudo tee "/etc/apt/sources.list.d/llvm-${LLVM_VERSION}.list"
62+
sudo apt-get update
63+
sudo apt-get install -y \
64+
build-essential \
65+
pkg-config \
66+
libpng-dev \
67+
libjpeg-turbo8-dev \
68+
"llvm-${LLVM_VERSION}-dev" \
69+
"clang-${LLVM_VERSION}" \
70+
"lld-${LLVM_VERSION}" \
71+
"liblld-${LLVM_VERSION}-dev"
72+
echo "LLVM_CONFIG=llvm-config-${LLVM_VERSION}" | tee -a "$GITHUB_ENV"
6073
elif [ "$RUNNER_OS" = "macOS" ]; then
61-
brew install libjpeg-turbo libpng pkgconf protobuf
74+
brew install libjpeg-turbo libpng pkgconf protobuf "llvm@${LLVM_VERSION}" "lld@${LLVM_VERSION}"
75+
echo "LLVM_CONFIG=$(brew --prefix "llvm@${LLVM_VERSION}")/bin/llvm-config" | tee -a "$GITHUB_ENV"
6276
fi
63-
uv sync --group ci-llvm-22 --no-install-project
77+
78+
uv sync --group ci-base --no-install-project
6479
echo "${GITHUB_WORKSPACE}/.venv/bin" | tee -a "$GITHUB_PATH"
6580
echo "VIRTUAL_ENV=${GITHUB_WORKSPACE}/.venv" | tee -a "$GITHUB_ENV"
66-
67-
- name: Configure Make
68-
run: |
69-
echo "LLVM_CONFIG=$(halide-llvm --bindir)/llvm-config" | tee -a "$GITHUB_ENV"
7081
echo "MAKEFLAGS=-j $(getconf _NPROCESSORS_ONLN)" | tee -a "$GITHUB_ENV"
7182
7283
- run: make build_tests

0 commit comments

Comments
 (0)