forked from mirrors/kingfisher
updated to rust 1.94
This commit is contained in:
parent
45e3933dfa
commit
5411a52211
5 changed files with 14 additions and 14 deletions
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
|
@ -13,7 +13,7 @@ env:
|
|||
VCPKG_DOWNLOADS: C:\vcpkg\downloads
|
||||
VCPKG_FEATURE_FLAGS: binarycaching
|
||||
VCPKG_BINARY_SOURCES: clear;x-gha,readwrite
|
||||
RUST_TOOLCHAIN: "1.92"
|
||||
RUST_TOOLCHAIN: "1.94"
|
||||
|
||||
jobs:
|
||||
linux-x64:
|
||||
|
|
|
|||
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
|
|
@ -21,7 +21,7 @@ env:
|
|||
VCPKG_DOWNLOADS: C:\vcpkg\downloads
|
||||
VCPKG_FEATURE_FLAGS: binarycaching
|
||||
VCPKG_BINARY_SOURCES: clear;x-gha,readwrite
|
||||
RUST_TOOLCHAIN: "1.92"
|
||||
RUST_TOOLCHAIN: "1.94"
|
||||
|
||||
jobs:
|
||||
# ──────────────── Linux (via Makefile) ────────────────
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@ Key capabilities:
|
|||
|
||||
## Toolchain and Environment
|
||||
- Shell assumptions in build scripts: `bash` with `set -eu -o pipefail`
|
||||
- Workspace minimum Rust version: `1.90` (`Cargo.toml`)
|
||||
- `make check-rust` enforces `>= 1.92.0` for build targets
|
||||
- Workspace minimum Rust version: `1.94` (`Cargo.toml`)
|
||||
- `make check-rust` enforces `>= 1.94.1` for build targets
|
||||
- Windows Makefile targets (`windows-x64`, `windows-arm64`) expect an MSYS2 environment with `pacman` available.
|
||||
- Prefer `rg` and `rg --files` for fast code/file search.
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ resolver = "2"
|
|||
|
||||
[workspace.package]
|
||||
edition = "2021"
|
||||
rust-version = "1.90"
|
||||
rust-version = "1.94"
|
||||
license = "Apache-2.0"
|
||||
authors = ["Mick Grove <mick.grove@mongodb.com>"]
|
||||
homepage = "https://github.com/mongodb/kingfisher"
|
||||
|
|
|
|||
18
Makefile
18
Makefile
|
|
@ -158,11 +158,11 @@ setup-zig:
|
|||
ubuntu-x64: setup-zig # ensures Zig & cargo-zigbuild exist
|
||||
@echo "Checking Rust toolchain…"
|
||||
@$(MAKE) check-rust || { \
|
||||
echo "🦀 Installing Rust 1.92.0 …"; \
|
||||
echo "🦀 Installing Rust 1.94.1 …"; \
|
||||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y; \
|
||||
. $$HOME/.cargo/env; \
|
||||
rustup toolchain install 1.92.0; \
|
||||
rustup default 1.92.0; \
|
||||
rustup toolchain install 1.94.1; \
|
||||
rustup default 1.94.1; \
|
||||
}
|
||||
|
||||
@echo "📦 Installing build dependencies (musl, cmake, etc.)…"
|
||||
|
|
@ -198,11 +198,11 @@ ubuntu-x64: setup-zig # ensures Zig & cargo-zigbuild exist
|
|||
ubuntu-arm64: setup-zig # ensures Zig & cargo-zigbuild exist
|
||||
@echo "Checking Rust toolchain…"
|
||||
@$(MAKE) check-rust || { \
|
||||
echo "🦀 Installing Rust 1.92.0 …"; \
|
||||
echo "🦀 Installing Rust 1.94.1 …"; \
|
||||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y; \
|
||||
. $$HOME/.cargo/env; \
|
||||
rustup toolchain install 1.92.0; \
|
||||
rustup default 1.92.0; \
|
||||
rustup toolchain install 1.94.1; \
|
||||
rustup default 1.94.1; \
|
||||
}
|
||||
|
||||
@echo "📦 Installing build dependencies (musl, cmake, etc.)…"
|
||||
|
|
@ -607,7 +607,7 @@ windows-test: windows-test-x64 windows-test-arm64
|
|||
linux-x64: check-docker create-dockerignore
|
||||
@mkdir -p target/release
|
||||
docker run --platform linux/amd64 --rm \
|
||||
-v "$$(pwd):/src" -w /src rust:1.92-alpine sh -eu -c '\
|
||||
-v "$$(pwd):/src" -w /src rust:1.94-alpine sh -eu -c '\
|
||||
apk add --no-cache \
|
||||
musl-dev \
|
||||
gcc g++ make cmake pkgconfig \
|
||||
|
|
@ -636,7 +636,7 @@ linux-x64: check-docker create-dockerignore
|
|||
linux-arm64: check-docker create-dockerignore
|
||||
@mkdir -p target/release
|
||||
docker run --platform linux/arm64 --rm \
|
||||
-v "$$(pwd):/src" -w /src rust:1.92-alpine sh -eu -c '\
|
||||
-v "$$(pwd):/src" -w /src rust:1.94-alpine sh -eu -c '\
|
||||
apk add --no-cache \
|
||||
musl-dev \
|
||||
gcc g++ make cmake pkgconfig \
|
||||
|
|
@ -749,7 +749,7 @@ check-rust:
|
|||
echo "Rust not found."; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
required=1.92.0; \
|
||||
required=1.94.1; \
|
||||
if [ $$(printf '%s\n' "$$required" "$$version" | sort -V | head -n1) != "$$required" ]; then \
|
||||
echo "Rust version $$version is older than required $$required."; \
|
||||
exit 1; \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue