Skip to content

Commit 0536013

Browse files
committed
Merge branch 'master' into cot-core-reloaded
2 parents 9b372af + 2721b6a commit 0536013

27 files changed

+2722
-39
lines changed

.cargo/config.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
11
[resolver]
22
incompatible-rust-versions = "fallback"
3+
4+
# TODO: Safe to remove once https://github.com/rust-lang/rust/issues/141626 gets resolved.
5+
# Also, see https://github.com/cot-rs/cot/pull/419/changes#r2636869773 for more info.
6+
[target.x86_64-pc-windows-msvc]
7+
linker = "rust-lld"
8+
rustflags = ["-C", "symbol-mangling-version=v0"]

.github/workflows/rust.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ env:
1515
SCCACHE_GHA_ENABLED: true
1616
RUSTC_WRAPPER: sccache
1717

18+
_RUST_STABLE: &rust_stable stable
19+
# Pinning the nightly version to a "stable" version to avoid CI breakages.
20+
_RUST_NIGHTLY: &rust_nightly nightly-2025-11-11
21+
1822
# See: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#concurrency.
1923
# This will ensure that only one commit will be running tests at a time on each PR.
2024
concurrency:
@@ -58,9 +62,9 @@ jobs:
5862
os: [ubuntu-latest, macos-latest, windows-latest]
5963
include:
6064
- rust: stable
61-
version: stable
65+
version: *rust_stable
6266
- rust: nightly
63-
version: nightly
67+
version: *rust_nightly
6468
- rust: MSRV
6569
version: "1.88" # MSRV
6670

@@ -149,7 +153,7 @@ jobs:
149153
uses: dtolnay/rust-toolchain@master
150154
with:
151155
# cot_macros ui tests require nightly
152-
toolchain: nightly
156+
toolchain: *rust_nightly
153157

154158
- name: Cache Cargo registry
155159
uses: Swatinem/rust-cache@v2
@@ -195,7 +199,7 @@ jobs:
195199
uses: dtolnay/rust-toolchain@master
196200
with:
197201
# branch coverage is currently optional and requires nightly
198-
toolchain: nightly
202+
toolchain: *rust_nightly
199203
components: llvm-tools-preview
200204

201205
- name: Reclaim disk space
@@ -248,7 +252,7 @@ jobs:
248252
uses: dtolnay/rust-toolchain@master
249253
with:
250254
# nightly-only rustfmt settings
251-
toolchain: nightly
255+
toolchain: *rust_nightly
252256
components: rustfmt
253257

254258
- name: Cache Cargo registry
@@ -299,7 +303,7 @@ jobs:
299303
uses: dtolnay/rust-toolchain@master
300304
with:
301305
# the `-Z` flag is only accepted on the nightly channel of Cargo
302-
toolchain: nightly
306+
toolchain: *rust_nightly
303307

304308
- name: Cache Cargo registry
305309
uses: Swatinem/rust-cache@v2
@@ -368,7 +372,7 @@ jobs:
368372
uses: dtolnay/rust-toolchain@master
369373
with:
370374
# miri requires nightly
371-
toolchain: nightly
375+
toolchain: *rust_nightly
372376
components: miri
373377

374378
- name: Cache Cargo registry

0 commit comments

Comments
 (0)