Commit 2d906fb4 authored by Graham King's avatar Graham King Committed by GitHub
Browse files

fix: Install specific toolchain (#329)

`cargo build --locked` won't let you use "1.85.0" if you only have "stable" installed, even if those are the same thing right now.
parent d316e576
...@@ -66,6 +66,7 @@ jobs: ...@@ -66,6 +66,7 @@ jobs:
if: ${{ env.ACT }} if: ${{ env.ACT }}
run: | run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
rustup toolchain install 1.85.0-x86_64-unknown-linux-gnu
echo "$HOME/.cargo/bin" >> $GITHUB_PATH echo "$HOME/.cargo/bin" >> $GITHUB_PATH
- name: Set up Rust Toolchain Components - name: Set up Rust Toolchain Components
run: rustup component add rustfmt clippy run: rustup component add rustfmt clippy
......
...@@ -30,6 +30,7 @@ RUN apt-get update && \ ...@@ -30,6 +30,7 @@ RUN apt-get update && \
RUN curl https://sh.rustup.rs -sSf | bash -s -- -y RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
ENV PATH="/root/.cargo/bin:${PATH}" ENV PATH="/root/.cargo/bin:${PATH}"
RUN rustup toolchain install 1.85.0-x86_64-unknown-linux-gnu
# Install OpenAI-compatible frontend and its dependencies from triton server # Install OpenAI-compatible frontend and its dependencies from triton server
# repository. These are used to have a consistent interface, schema, and FastAPI # repository. These are used to have a consistent interface, schema, and FastAPI
......
...@@ -69,6 +69,7 @@ RUN apt update -y && \ ...@@ -69,6 +69,7 @@ RUN apt update -y && \
pkg-config && \ pkg-config && \
curl https://sh.rustup.rs -sSf | bash -s -- -y curl https://sh.rustup.rs -sSf | bash -s -- -y
ENV PATH="/root/.cargo/bin:${PATH}" ENV PATH="/root/.cargo/bin:${PATH}"
RUN rustup toolchain install 1.85.0-x86_64-unknown-linux-gnu
# Working directory # Working directory
WORKDIR /workspace WORKDIR /workspace
...@@ -168,4 +169,4 @@ WORKDIR /workspace ...@@ -168,4 +169,4 @@ WORKDIR /workspace
# FIXME: May want a modification with triton-distributed banner on entry # FIXME: May want a modification with triton-distributed banner on entry
ENTRYPOINT ["/opt/nvidia/nvidia_entrypoint.sh"] ENTRYPOINT ["/opt/nvidia/nvidia_entrypoint.sh"]
CMD [] CMD []
\ No newline at end of file
...@@ -199,6 +199,7 @@ RUN apt update -y && \ ...@@ -199,6 +199,7 @@ RUN apt update -y && \
pkg-config && \ pkg-config && \
curl https://sh.rustup.rs -sSf | bash -s -- -y curl https://sh.rustup.rs -sSf | bash -s -- -y
ENV PATH="/root/.cargo/bin:${PATH}" ENV PATH="/root/.cargo/bin:${PATH}"
RUN rustup toolchain install 1.85.0-x86_64-unknown-linux-gnu
# Working directory # Working directory
WORKDIR /workspace WORKDIR /workspace
......
[toolchain] [toolchain]
channel = "1.84.1" channel = "1.85.0"
[toolchain] [toolchain]
channel = "1.84.1" channel = "1.85.0"
[toolchain] [toolchain]
channel = "1.84.1" channel = "1.85.0"
[toolchain] [toolchain]
channel = "1.84.1" channel = "1.85.0"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment