Skip to content

refactor(rust) :: pin toolchain with rust-toolchain.toml #1487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
81reap wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −16
Open

refactor(rust) :: pin toolchain with rust-toolchain.toml #1487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 11 additions & 14 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,11 @@ jobs:
steps:
- uses: actions/checkout@v7
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# don't overrwrite `.cargo/config.toml`
rustflags: ""
targets: ${{ matrix.target }}
- name: Set up cargo cache
uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
env:
NODE_OPTIONS: --no-deprecation
- uses: ./.github/actions/install-frontend-dependencies
- name: Build
run: cargo build --profile superoptimized --locked --target ${{ matrix.target }} --features "${{ matrix.features }}"
Expand Down Expand Up @@ -89,13 +87,11 @@ jobs:
steps:
- uses: actions/checkout@v7
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# don't overrwrite `.cargo/config.toml`
rustflags: ""
targets: x86_64-unknown-linux-gnu
- name: Set up cargo cache
uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
env:
NODE_OPTIONS: --no-deprecation
- uses: ./.github/actions/install-frontend-dependencies
- name: Build
run: cargo build --profile superoptimized --locked --target x86_64-unknown-linux-gnu --features "odbc-static"
Expand Down Expand Up @@ -157,10 +153,11 @@ jobs:
if: startsWith(github.ref, 'refs/tags/')
steps:
- uses: actions/checkout@v7
- name: Set up cargo cache
uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
env:
NODE_OPTIONS: --no-deprecation
- name: Install Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# don't overrwrite `.cargo/config.toml`
rustflags: ""
- run: sudo apt-get update && sudo apt-get install -y unixodbc-dev
- uses: ./.github/actions/install-frontend-dependencies
- name: Publish to crates.io
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lambda.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[toolchain]
channel = "1.98.1"
profile = "minimal"
components = ["clippy", "rust-analyzer", "rust-src", "rustfmt"]
Loading