Skip to content

Commit

Permalink
Update for 17
Browse files Browse the repository at this point in the history
  • Loading branch information
steven-johnson committed Dec 1, 2023
1 parent 63ea82d commit 9adc371
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ RUN git clone --depth 1 --branch v1.11.1 https://github.com/ninja-build/ninja.gi
rm -rf ninja build

## Install ZLIB
ARG ZLIB_TAG=v1.2.12
ARG ZLIB_TAG=v1.3
RUN git clone --depth 1 --branch "$ZLIB_TAG" https://github.com/madler/zlib.git && \
cmake -G Ninja -S zlib -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON && \
cmake --build build --target install && \
rm -rf zlib build && \
rm -f /usr/local/lib/libz.so*

## Install LLVM
ARG LLVM_TAG=llvmorg-15.0.1
ARG LLVM_TAG=llvmorg-17.0.6
RUN git clone --depth 1 --branch "$LLVM_TAG" https://github.com/llvm/llvm-project.git
RUN cmake -G Ninja -S llvm-project/llvm -B build -DCMAKE_BUILD_TYPE=Release \
-DLLVM_ENABLE_PROJECTS="clang;lld" \
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ already, the following:
the first argument. The `reset-docker.sh` script will delete
**everything** from your local Docker instance, so be warned. But it can
come in handy when disk space is an issue.
5. Push the images via `docker push ghcr.io/halide/manylinux2014_aarch64-llvm:15.0.7`,
`docker push ghcr.io/halide/manylinux2014_i686-llvm:15.0.7`, and
`docker push ghcr.io/halide/manylinux2014_x86_64-llvm:15.0.7`.
5. Push the images via

docker push ghcr.io/halide/manylinux2014_aarch64-llvm:17.0.6
docker push ghcr.io/halide/manylinux2014_x86_64-llvm:17.0.6

See the docs for more details: https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry

Expand Down
6 changes: 3 additions & 3 deletions build-images.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash

set -e
set -ex

[[ "$1" != "" ]] && echo "You must specify the LLVM version as an argument, e.g. 15.0.7" && exit
[[ "$1" == "" ]] && echo "You must specify the LLVM version as an argument, e.g. 17.0.6" && exit

LLVM_TAG=$1

Expand All @@ -12,5 +12,5 @@ build_image() {
}

build_image x86_64
build_image i686
# build_image i686
build_image aarch64

0 comments on commit 9adc371

Please sign in to comment.