Skip to content

Commit

Permalink
Merge pull request #64 from malor/fix-ci
Browse files Browse the repository at this point in the history
Fix CI
  • Loading branch information
malor authored Apr 1, 2024
2 parents b66b680 + 9fbc097 commit ad32f4d
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 121 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN if [ "${LLDB_VERSION}" = "9" ]; then \

ENV PYTHONPATH /usr/lib/llvm-${LLDB_VERSION}/lib/python3/dist-packages

RUN python -m pip install poetry
RUN python -m pip install poetry six

COPY . /root/.lldb/cpython-lldb
RUN cd /root/.lldb/cpython-lldb && \
Expand Down
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@ PY_VERSION ?= 3.10
LLDB_VERSION ?= 11
DOCKER_IMAGE_TAG = $(PY_VERSION)-lldb$(LLDB_VERSION)

# older LLVM versions are not packaged for Debian Bullseye, which is the new stable
# used in Python Docker images. We can fall back to Buster images for testing those
ifeq ($(shell test $(LLDB_VERSION) -lt 11 && echo true), true)
# LLVM >= 7: https://apt.llvm.org/buster/pool/main/l/
PY_DISTRO = $(PY_VERSION)-buster
else ifeq ($(shell test $(LLDB_VERSION) -lt 15 && echo true), true)
# LLVM >= 11: https://apt.llvm.org/bullseye/pool/main/l/
PY_DISTRO = $(PY_VERSION)-bullseye
else
# LLVM >= 15
PY_DISTRO = $(PY_VERSION)
endif

Expand Down
Loading

0 comments on commit ad32f4d

Please sign in to comment.