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
26 changes: 13 additions & 13 deletions .agents/cloud-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -350,12 +350,12 @@ fetch_verified() {

export RUSTUP_HOME=/opt/stll-cloud/rustup
export CARGO_HOME=/opt/stll-cloud/cargo
export RUSTUP_TOOLCHAIN='1.99.0'
export RUSTUP_TOOLCHAIN='1.99.1'
export RUSTUP_AUTO_INSTALL=0
rust_run() {
local mode="$1"
shift
set -- runuser -u "$OUTPUT_USER" -- env HOME="$OUTPUT_HOME" RUSTUP_HOME="$RUSTUP_HOME" CARGO_HOME="$CARGO_HOME" RUSTUP_AUTO_INSTALL=0 RUSTUP_TOOLCHAIN=1.99.0 RUSTUP_DIST_SERVER=https://static.rust-lang.org RUSTUP_UPDATE_ROOT=https://static.rust-lang.org/rustup PATH="$PATH" "$@"
set -- runuser -u "$OUTPUT_USER" -- env HOME="$OUTPUT_HOME" RUSTUP_HOME="$RUSTUP_HOME" CARGO_HOME="$CARGO_HOME" RUSTUP_AUTO_INSTALL=0 RUSTUP_TOOLCHAIN=1.99.1 RUSTUP_DIST_SERVER=https://static.rust-lang.org RUSTUP_UPDATE_ROOT=https://static.rust-lang.org/rustup PATH="$PATH" "$@"
case "$mode" in
local) "$@" ;;
network) network_run static.rust-lang.org 180 "$@" ;;
Expand All @@ -369,12 +369,12 @@ primary_rust_ready() {
done
[[ -x "$CARGO_HOME/bin/rustup" ]] || return 1
[[ "$(rust_run local "$CARGO_HOME/bin/rustup" --version 2>/dev/null)" == 'rustup 1.29.1 '* ]] || return 1
[[ "$(rust_run local "$CARGO_HOME/bin/rustc" +1.99.0 --version)" == 'rustc 1.99.0 '* ]] || return 1
[[ "$(rust_run local "$CARGO_HOME/bin/rustc" +1.99.1 --version)" == 'rustc 1.99.1 '* ]] || return 1
local host
host="$(rust_run local "$CARGO_HOME/bin/rustc" +1.99.0 -vV | awk '$1 == "host:" { print $2 }')" || return 1
rust_run local "$CARGO_HOME/bin/rustup" component list --toolchain '1.99.0' --installed | awk -v name='clippy' -v host="$host" '$1 == name || $1 == name "-" host { found=1 } END { exit !found }' || return 1
rust_run local "$CARGO_HOME/bin/rustup" component list --toolchain '1.99.0' --installed | awk -v name='rustfmt' -v host="$host" '$1 == name || $1 == name "-" host { found=1 } END { exit !found }' || return 1
rust_run local "$CARGO_HOME/bin/rustup" target list --toolchain '1.99.0' --installed | awk -v name='wasm32-unknown-unknown' '$1 == name { found=1 } END { exit !found }' || return 1
host="$(rust_run local "$CARGO_HOME/bin/rustc" +1.99.1 -vV | awk '$1 == "host:" { print $2 }')" || return 1
rust_run local "$CARGO_HOME/bin/rustup" component list --toolchain '1.99.1' --installed | awk -v name='clippy' -v host="$host" '$1 == name || $1 == name "-" host { found=1 } END { exit !found }' || return 1
rust_run local "$CARGO_HOME/bin/rustup" component list --toolchain '1.99.1' --installed | awk -v name='rustfmt' -v host="$host" '$1 == name || $1 == name "-" host { found=1 } END { exit !found }' || return 1
rust_run local "$CARGO_HOME/bin/rustup" target list --toolchain '1.99.1' --installed | awk -v name='wasm32-unknown-unknown' '$1 == name { found=1 } END { exit !found }' || return 1
return 0
}
rust_ready() {
Expand Down Expand Up @@ -412,14 +412,14 @@ esac
fi
rust_run local "$CARGO_HOME/bin/rustup" set auto-self-update disable
if ! primary_rust_ready; then
rust_run network "$CARGO_HOME/bin/rustup" toolchain install 1.99.0 --profile minimal --no-self-update '--component' 'clippy' '--component' 'rustfmt' '--target' 'wasm32-unknown-unknown'
rust_run network "$CARGO_HOME/bin/rustup" toolchain install 1.99.1 --profile minimal --no-self-update '--component' 'clippy' '--component' 'rustfmt' '--target' 'wasm32-unknown-unknown'
fi

rust_run local "$CARGO_HOME/bin/rustup" default 1.99.0
rust_run local "$CARGO_HOME/bin/rustup" default 1.99.1
verify_rust
for tool in rustup cargo rustc rustdoc cargo-clippy clippy-driver rustfmt cargo-fmt; do
# Launchers persist the system homes in fresh shells without profile sourcing.
printf '%s\n' '#!/bin/sh' 'export RUSTUP_HOME=/opt/stll-cloud/rustup' 'export CARGO_HOME=/opt/stll-cloud/cargo' 'export RUSTUP_AUTO_INSTALL=0' 'export RUSTUP_TOOLCHAIN=1.99.0' "exec /opt/stll-cloud/cargo/bin/$tool \"\$@\"" > "$scratch/$tool"
printf '%s\n' '#!/bin/sh' 'export RUSTUP_HOME=/opt/stll-cloud/rustup' 'export CARGO_HOME=/opt/stll-cloud/cargo' 'export RUSTUP_AUTO_INSTALL=0' 'export RUSTUP_TOOLCHAIN=1.99.1' "exec /opt/stll-cloud/cargo/bin/$tool \"\$@\"" > "$scratch/$tool"
if ! cmp -s "$scratch/$tool" "/usr/local/bin/$tool"; then
[[ ! -d "/usr/local/bin/$tool" ]] || fail 'Install target is a directory; remove it and rerun install:' "/usr/local/bin/$tool"
install -m 755 "$scratch/$tool" "/usr/local/bin/$tool"
Expand Down Expand Up @@ -465,7 +465,7 @@ export PATH='/opt/stll-cloud/node/26.10.0/bin:/opt/stll-cloud/bun/1.4.4:/usr/loc
unset _stll_cloud_remaining _stll_cloud_result _stll_cloud_separator _stll_cloud_part _stll_cloud_more
export RUSTUP_HOME=/opt/stll-cloud/rustup
export CARGO_HOME=/opt/stll-cloud/cargo
export RUSTUP_TOOLCHAIN='1.99.0'
export RUSTUP_TOOLCHAIN='1.99.1'
export RUSTUP_AUTO_INSTALL=0
STLL_CLOUD_PROFILE
if ! cmp -s "$temporary" '/etc/profile.d/stll-cloud.sh'; then install -m 644 "$temporary" '/etc/profile.d/stll-cloud.sh'; fi
Expand Down Expand Up @@ -502,11 +502,11 @@ done
)
verify_shell_environment() {
[[ -f '/etc/profile.d/stll-cloud.sh' && ! -L '/etc/profile.d/stll-cloud.sh' && "$(stat -c '%h:%u' '/etc/profile.d/stll-cloud.sh')" == 1:0 ]] || fail 'Managed shell environment is unavailable; run install'
[[ "$(sha256sum -- '/etc/profile.d/stll-cloud.sh' | cut -d ' ' -f1)" == '2e96da10364dade2b051fb77195abb3c42a3e848804b86ef26ada7aa6d392858' ]] || fail 'Managed shell environment differs; run install'
[[ "$(sha256sum -- '/etc/profile.d/stll-cloud.sh' | cut -d ' ' -f1)" == '24dfcdbf02036ed628e0fbc62bc76ec11f67e2df81f9e1ae4e3709bab30a0fb1' ]] || fail 'Managed shell environment differs; run install'
}


[[ -f 'rust-toolchain.toml' && ! -L 'rust-toolchain.toml' ]] && [[ "$(sha256sum -- 'rust-toolchain.toml' | cut -d ' ' -f1)" == '72f7dd8c9fdf9c1fcd8eb8bf9326d4bc66833e4ebf4bc2932636e2b85efcb7af' ]] || fail 'rust-toolchain.toml changed; regenerate cloud-setup.sh'
[[ -f 'rust-toolchain.toml' && ! -L 'rust-toolchain.toml' ]] && [[ "$(sha256sum -- 'rust-toolchain.toml' | cut -d ' ' -f1)" == 'b9c8d2d59f6f46474c0cfa0b8b77bea21d94fc73a30ad93d5bf6385c422197d2' ]] || fail 'rust-toolchain.toml changed; regenerate cloud-setup.sh'
[[ ! -e 'rust-toolchain' && ! -L 'rust-toolchain' ]] || fail 'rust-toolchain appeared; regenerate cloud-setup.sh'


Expand Down
4 changes: 4 additions & 0 deletions .changeset/rust-patch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
---

Adopt the shared Rust 1.99.1 toolchain policy and regenerate development setup for the FFI and linker fixes.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ jobs:

- name: Setup shared stable Rust
run: |
rustup toolchain install 1.99.0 --profile minimal --component rustfmt,clippy
rustup default 1.99.0
rustup toolchain install 1.99.1 --profile minimal --component rustfmt,clippy
rustup default 1.99.1
- name: Install shared stable source checker
run: >-
cargo install --git https://github.com/stella/tooling
Expand Down Expand Up @@ -232,9 +232,9 @@ jobs:
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-1.99.0-${{ hashFiles('Cargo.lock') }}
key: ${{ runner.os }}-cargo-1.99.1-${{ hashFiles('Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-1.99.0-
${{ runner.os }}-cargo-1.99.1-

- name: Rust checks (fmt, clippy, source lint, test)
run: bun run rust:check
Expand Down Expand Up @@ -278,7 +278,7 @@ jobs:
- run: bun install --frozen-lockfile
- name: Install the WebAssembly build toolchain
run: |
rustup target add wasm32-unknown-unknown --toolchain 1.99.0
rustup target add wasm32-unknown-unknown --toolchain 1.99.1
cargo install wasm-bindgen-cli --version 0.2.129 --locked
- run: bun run typecheck
- run: bun run build
Expand All @@ -293,7 +293,7 @@ jobs:
- name: Build the Python abi3 wheel
uses: PyO3/maturin-action@e83996d129638aa358a18fbd1dfb82f0b0fb5d3b # v1.51.0
with:
rust-toolchain: "1.99.0"
rust-toolchain: "1.99.1"
args: >-
--release
--locked
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/cla.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
name: CLA Assistant

on:
workflow_dispatch:
inputs:
pull_requests:
description: Pull request numbers separated by commas or spaces
type: string
required: true
issue_comment:
types: [created]
pull_request_target: # zizmor: ignore[dangerous-triggers] delegates to pinned reusable CLA workflow; never check out PR code here
types: [opened, synchronize, reopened, closed]

permissions:
actions: write
checks: write
contents: read
issues: write
pull-requests: write
Expand All @@ -18,6 +25,7 @@ jobs:
if: >-
(
github.event_name == 'pull_request_target'
|| github.event_name == 'workflow_dispatch'
) || (
github.event_name == 'issue_comment'
&& github.event.issue.pull_request
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/mutants.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:

- name: Setup Rust
run: |
rustup toolchain install 1.99.0 --profile minimal
rustup default 1.99.0
rustup toolchain install 1.99.1 --profile minimal
rustup default 1.99.1

- name: Install pinned Rust tools (checksum-verified)
# nextest is the test runner used by cargo-mutants. taiki-e/install-action
Expand All @@ -46,9 +46,9 @@ jobs:
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-mutants-1.99.0-${{ hashFiles('Cargo.lock') }}
key: ${{ runner.os }}-mutants-1.99.1-${{ hashFiles('Cargo.lock') }}
restore-keys: |
${{ runner.os }}-mutants-1.99.0-
${{ runner.os }}-mutants-1.99.1-

- name: Run cargo-mutants
# Scoped to the validation core (lib.rs). The fast unit cases
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ jobs:

- name: Install Rust toolchain
run: |
rustup toolchain install 1.99.0 --profile minimal --component rustfmt,clippy
rustup default 1.99.0
rustup toolchain install 1.99.1 --profile minimal --component rustfmt,clippy
rustup default 1.99.1

- name: Verify versions and generated sources
run: |
Expand Down Expand Up @@ -146,8 +146,8 @@ jobs:

- name: Install Rust toolchain
run: |
rustup toolchain install 1.99.0 --profile minimal
rustup default 1.99.0
rustup toolchain install 1.99.1 --profile minimal
rustup default 1.99.1

- name: Build native addon
run: node scripts/build-native-node.mjs
Expand Down Expand Up @@ -201,9 +201,9 @@ jobs:

- name: Install Rust and wasm-bindgen
run: |
rustup toolchain install 1.99.0 --profile minimal
rustup target add wasm32-unknown-unknown --toolchain 1.99.0
rustup default 1.99.0
rustup toolchain install 1.99.1 --profile minimal
rustup target add wasm32-unknown-unknown --toolchain 1.99.1
rustup default 1.99.1
cargo install wasm-bindgen-cli --version 0.2.129 --locked

- name: Build portable packages
Expand Down Expand Up @@ -311,7 +311,7 @@ jobs:
with:
target: ${{ matrix.target }}
manylinux: ${{ matrix.manylinux || 'auto' }}
rust-toolchain: "1.99.0"
rust-toolchain: "1.99.1"
args: >-
--release
--locked
Expand Down
4 changes: 2 additions & 2 deletions bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@brazilian-utils/brazilian-utils": "^2.5.0",
"@changesets/changelog-github": "^1.0.1",
"@changesets/cli": "^3.0.3",
"@stll/oxlint-config": "3.2.0",
"@stll/oxlint-config": "3.2.1",
"@stll/oxlint-plugin": "0.7.0",
"@stll/typescript-config": "0.10.0",
"@types/node": "^26.6.5",
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.99.0"
channel = "1.99.1"
components = ["rustfmt", "clippy"]
profile = "minimal"
2 changes: 1 addition & 1 deletion stll-toolchain.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"rustExceptions": [
{
"pin": "1.97.1",
"reason": "cargo-hawk compiler-private APIs require Rust 1.97.1; ordinary Rust checks use shared Rust 1.99.0.",
"reason": "cargo-hawk compiler-private APIs require Rust 1.97.1; ordinary Rust checks use shared Rust 1.99.1.",
"tracking": "https://github.com/stella/tooling/issues/99",
"expires": "2026-11-11"
}
Expand Down
Loading