Skip to content

Commit

Permalink
Update rust to nightly-2023-12-07 (#30)
Browse files Browse the repository at this point in the history
  • Loading branch information
meowjesty authored Dec 7, 2023
1 parent a3ccddc commit 764e408
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions agent-build/builder.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ FROM buildpack-deps:buster
RUN apt-get update && apt-get install -y protobuf-compiler gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-x86-64-linux-gnu clang zip
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o rustup-init.sh
RUN chmod +x rustup-init.sh
RUN ./rustup-init.sh -y -c rustfmt --default-toolchain nightly-2023-09-07
RUN ./rustup-init.sh -y -c rustfmt --default-toolchain nightly-2023-12-07
ENV PATH="$PATH:/root/.cargo/bin"
RUN rustup target add --toolchain nightly-2023-09-07 x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu
RUN rustup target add --toolchain nightly-2023-12-07 x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu

RUN curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py
RUN CARGO_NET_GIT_FETCH_WITH_CLI=true python3 -m pip install cargo-zigbuild
4 changes: 2 additions & 2 deletions docs-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ RUN apt-get update && apt-get install -y protobuf-compiler clang rsync gcc-x86-6

RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o rustup-init.sh
RUN chmod +x rustup-init.sh
RUN ./rustup-init.sh -y -c rustfmt --default-toolchain nightly-2023-09-07
RUN ./rustup-init.sh -y -c rustfmt --default-toolchain nightly-2023-12-07
ENV PATH="$PATH:/root/.cargo/bin"
RUN rustup target add --toolchain nightly-2023-09-07 x86_64-unknown-linux-gnu
RUN rustup target add --toolchain nightly-2023-12-07 x86_64-unknown-linux-gnu
6 changes: 3 additions & 3 deletions tests-runner/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ SHELL ["/bin/bash", "-c"]
# rust stuff
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o rustup-init.sh
RUN chmod +x rustup-init.sh
RUN ./rustup-init.sh -y -c rustfmt -c clippy --default-toolchain nightly-2023-09-07
RUN ./rustup-init.sh -y -c rustfmt -c clippy --default-toolchain nightly-2023-12-07
ENV PATH="/root/.cargo/bin:$PATH"
RUN rustup target add --toolchain nightly-2023-09-07 aarch64-unknown-linux-gnu x86_64-unknown-linux-gnu x86_64-apple-darwin aarch64-apple-darwin
RUN rustup target add --toolchain nightly-2023-12-07 aarch64-unknown-linux-gnu x86_64-unknown-linux-gnu x86_64-apple-darwin aarch64-apple-darwin


# install pip for cargo-zigbuild
Expand Down Expand Up @@ -52,4 +52,4 @@ RUN mv ./kubectl /usr/local/bin

# java
RUN curl -s "https://get.sdkman.io" | bash
RUN source "/root/.sdkman/bin/sdkman-init.sh" && sdk install java 17.0.6-tem
RUN source "/root/.sdkman/bin/sdkman-init.sh" && sdk install java 17.0.6-tem

0 comments on commit 764e408

Please sign in to comment.