Skip to content

Commit 0d1a448

Browse files
committed
refactor(rust) :: pin toolchain with rust-toolchain.toml
Before the Dockerfile pinned 1.95 but the CI steps would use the current stable version of Rust. Now they are all pinned to the same version via `rust-toolchain.toml`. This requires using `actions-rust-lang/setup-rust-toolchain` as it respects the toml file.
1 parent fd04efc commit 0d1a448

4 files changed

Lines changed: 17 additions & 16 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,11 @@ jobs:
3131
steps:
3232
- uses: actions/checkout@v7
3333
- name: Install Rust toolchain
34-
uses: dtolnay/rust-toolchain@stable
34+
uses: actions-rust-lang/setup-rust-toolchain@v1
3535
with:
36+
# don't overrwrite `.cargo/config.toml`
37+
rustflags: ""
3638
targets: ${{ matrix.target }}
37-
- name: Set up cargo cache
38-
uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
39-
env:
40-
NODE_OPTIONS: --no-deprecation
4139
- uses: ./.github/actions/install-frontend-dependencies
4240
- name: Build
4341
run: cargo build --profile superoptimized --locked --target ${{ matrix.target }} --features "${{ matrix.features }}"
@@ -89,13 +87,11 @@ jobs:
8987
steps:
9088
- uses: actions/checkout@v7
9189
- name: Install Rust toolchain
92-
uses: dtolnay/rust-toolchain@stable
90+
uses: actions-rust-lang/setup-rust-toolchain@v1
9391
with:
92+
# don't overrwrite `.cargo/config.toml`
93+
rustflags: ""
9494
targets: x86_64-unknown-linux-gnu
95-
- name: Set up cargo cache
96-
uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
97-
env:
98-
NODE_OPTIONS: --no-deprecation
9995
- uses: ./.github/actions/install-frontend-dependencies
10096
- name: Build
10197
run: cargo build --profile superoptimized --locked --target x86_64-unknown-linux-gnu --features "odbc-static"
@@ -157,10 +153,11 @@ jobs:
157153
if: startsWith(github.ref, 'refs/tags/')
158154
steps:
159155
- uses: actions/checkout@v7
160-
- name: Set up cargo cache
161-
uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
162-
env:
163-
NODE_OPTIONS: --no-deprecation
156+
- name: Install Rust toolchain
157+
uses: actions-rust-lang/setup-rust-toolchain@v1
158+
with:
159+
# don't overrwrite `.cargo/config.toml`
160+
rustflags: ""
164161
- run: sudo apt-get update && sudo apt-get install -y unixodbc-dev
165162
- uses: ./.github/actions/install-frontend-dependencies
166163
- name: Publish to crates.io

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ COPY frontend/src/ frontend/src/
66
COPY scripts/build-frontend.mjs scripts/
77
RUN node scripts/build-frontend.mjs
88

9-
FROM --platform=$BUILDPLATFORM rust:1.95-slim AS builder
9+
FROM --platform=$BUILDPLATFORM rust:1.98.1-slim AS builder
1010

1111
WORKDIR /usr/src/sqlpage
1212
ARG TARGETARCH

‎lambda.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ COPY frontend/src/ frontend/src/
66
COPY scripts/build-frontend.mjs scripts/
77
RUN node scripts/build-frontend.mjs
88

9-
FROM rust:1.95-alpine AS builder
9+
FROM rust:1.98.1-alpine AS builder
1010
RUN rustup component add clippy rustfmt
1111
RUN apk add --no-cache musl-dev zip
1212
WORKDIR /usr/src/sqlpage

‎rust-toolchain.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[toolchain]
2+
channel = "1.98.1"
3+
profile = "minimal"
4+
components = ["clippy", "rust-analyzer", "rust-src", "rustfmt"]

0 commit comments

Comments
 (0)