diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3da174c5..902b77b7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,10 +30,6 @@ jobs: features: "odbc-static" steps: - uses: actions/checkout@v7 - - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@stable - with: - targets: ${{ matrix.target }} - name: Set up cargo cache uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 env: @@ -88,10 +84,11 @@ jobs: container: quay.io/pypa/manylinux_2_28_x86_64 steps: - uses: actions/checkout@v7 - - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@stable - with: - targets: x86_64-unknown-linux-gnu + # The manylinux image ships no rustup, unlike the GitHub-hosted runners. + - name: Install rustup + run: | + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none + echo "$HOME/.cargo/bin" >> "$GITHUB_PATH" - name: Set up cargo cache uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 env: diff --git a/Dockerfile b/Dockerfile index 71c5149b..e12dd0d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ COPY frontend/src/ frontend/src/ COPY scripts/build-frontend.mjs scripts/ RUN node scripts/build-frontend.mjs -FROM --platform=$BUILDPLATFORM rust:1.95-slim AS builder +FROM --platform=$BUILDPLATFORM rust:1.98.1-slim AS builder WORKDIR /usr/src/sqlpage ARG TARGETARCH diff --git a/lambda.Dockerfile b/lambda.Dockerfile index f17f3f94..934b4df2 100644 --- a/lambda.Dockerfile +++ b/lambda.Dockerfile @@ -6,7 +6,7 @@ COPY frontend/src/ frontend/src/ COPY scripts/build-frontend.mjs scripts/ RUN node scripts/build-frontend.mjs -FROM rust:1.95-alpine AS builder +FROM rust:1.98.1-alpine AS builder RUN rustup component add clippy rustfmt RUN apk add --no-cache musl-dev zip WORKDIR /usr/src/sqlpage diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100755 index 00000000..de4110d9 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +channel = "1.98.1" +profile = "minimal" +components = ["clippy", "rust-analyzer", "rust-src", "rustfmt"]