Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
docker push $IMAGE_ID:$VERSION
build-windows:
name: Run windows image build
runs-on: windows-latest
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
- name: Build image
Expand Down
11 changes: 6 additions & 5 deletions linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ USER root
ENV DEBIAN_FRONTEND=noninteractive

ARG LLVM_VERSION=21
ARG RUST_VERSION=1.90
ARG RUST_VERSION=1.93.1

# Install LLVM and its dependencies
RUN apt update \
Expand All @@ -17,11 +17,10 @@ RUN apt update \
&& wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh $LLVM_VERSION \
&& apt install -y --no-install-recommends clang lld liblld-$LLVM_VERSION-dev libpolly-$LLVM_VERSION-dev

# TODO: Remove this once we completely switched over to LLVM 21
RUN apt install -y zip clang lldb lld clangd clang-14 lldb-14 lld-14 clangd-14 liblld-14-dev llvm-14-dev libpolly-14-dev

# Install llvm-lit, used by our correctness tests
COPY --from=ghcr.io/astral-sh/uv:0.9.17 /uv /uvx /bin/
# Use a non root directory for uv
ENV UV_TOOL_DIR="/usr/local/uv"
ENV UV_TOOL_BIN_DIR="/usr/local/bin/"
RUN uv tool install lit

Expand All @@ -35,8 +34,10 @@ ENV PATH="${CARGO_HOME}/bin:${PATH}"
RUN rustup toolchain install $RUST_VERSION \
&& rustup default $RUST_VERSION \
&& rustup component add clippy rustfmt llvm-tools-preview \
&& rustup target add x86_64-unknown-linux-gnu \
&& rustup target add aarch64-unknown-linux-gnu \
&& rustup target add x86_64-unknown-linux-musl
&& rustup target add x86_64-unknown-linux-musl \
&& rustup target add aarch64-unknown-linux-musl

RUN chmod -R a+rw $CARGO_HOME \
&& chmod -R a+rw $RUSTUP_HOME \
Expand Down
6 changes: 3 additions & 3 deletions windows/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ ARG BASE_IMAGE=mcr.microsoft.com/windows/servercore:$WINDOWS_VERSION
FROM $BASE_IMAGE

ARG LLVM_VER=21.1.7
ARG RUST_VER=1.90
ARG ZIP_VERSION=2501
ARG GIT_VERSION=2.51.0
ARG RUST_VER=1.93.1
ARG ZIP_VERSION=2600
ARG GIT_VERSION=2.53.0

WORKDIR C:/buildtools

Expand Down
Loading