Skip to content

Commit 28bf588

Browse files
committed
promote ctest-next to ctest
1 parent 8dc8c4f commit 28bf588

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+77
-101
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
name: Verify build
5656
strategy:
5757
matrix:
58-
toolchain: [stable, nightly, 1.63.0]
58+
toolchain: [stable, nightly, 1.88.0]
5959
os: [ubuntu-24.04, macos-15, windows-2022]
6060
include:
6161
- toolchain: beta
@@ -88,8 +88,6 @@ jobs:
8888
if [ "${{ matrix.toolchain }}" = "1.63.0" ]; then
8989
# Remove `-Dwarnings` at the MSRV since lints may be different
9090
export RUSTFLAGS=""
91-
# Remove `ctest-next` which uses the 2024 edition
92-
perl -i -ne 'print unless /"ctest-(next|test)",/ || /"libc-test",/' Cargo.toml
9391
fi
9492
9593
./ci/verify-build.sh
@@ -306,21 +304,19 @@ jobs:
306304
./ci/run.sh ${{ matrix.target }}
307305
308306
ctest_msrv:
309-
name: Check MSRV
307+
name: Check ctest MSRV
310308
runs-on: ubuntu-24.04
311309
timeout-minutes: 10
312310
env:
313311
RUSTFLAGS: # No need to check warnings on old MSRV, unset `-Dwarnings`
314312
steps:
315313
- uses: actions/checkout@master
316314
- run: |
317-
msrv="$(cargo metadata --format-version 1 | jq -r --arg CRATE_NAME ctest '.packages | map(select(.name == $CRATE_NAME)) | first | .rust_version')"
315+
msrv="$(cargo metadata --format-version 1 | jq -r --arg CRATE_NAME ctest '.packages | map(select(.name == $CRATE_NAME)) | last | .rust_version')"
318316
echo "MSRV: $msrv"
319317
echo "MSRV=$msrv" >> "$GITHUB_ENV"
320318
- name: Install Rust
321319
run: rustup update "$MSRV" --no-self-update && rustup default "$MSRV"
322-
- name: Remove edition 2024 crates
323-
run: perl -i -ne 'print unless /"ctest-(next|test)",/ || /"libc-test",/' Cargo.toml
324320
- uses: Swatinem/rust-cache@v2
325321
- run: cargo build -p ctest
326322

Cargo.lock

Lines changed: 5 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ extra_traits = []
141141
[workspace]
142142
members = [
143143
"ctest",
144-
"ctest-next",
145144
"ctest-test",
146145
"libc-test",
147146
]

ctest-next/Cargo.toml renamed to ctest/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
2-
name = "ctest-next"
3-
version = "0.1.0"
2+
name = "ctest"
3+
version = "0.5.0-beta.0"
44
edition = "2024"
55
rust-version = "1.88"
66
license = "MIT OR Apache-2.0"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)