Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 5 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
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
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
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