Skip to content

Commit 76204d5

Browse files
ci: Improve CI for v2 (#305)
* ci: Update checkout and toolchain actions. These resulted in warnings in the GitHub Actions UI. The `actions-rs` actions haven't been maintained in some time. * ci: Remove test of `union` feature. This feature no longer exists, so a test for it isn't needed. * MSRV for v2 is actually 1.57. This uses const_panic and other features which have ratcheted the MSRV forward from what it was in v1. * ci: Run apt-get update when installing system packages.
1 parent f905dfa commit 76204d5

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
toolchain: ["stable", "beta", "nightly", "1.36.0"]
15+
toolchain: ["stable", "beta", "nightly", "1.57.0"]
1616
include:
1717
- toolchain: stable
1818
env:
@@ -21,17 +21,16 @@ jobs:
2121
env:
2222
DO_FUZZ: 1
2323
steps:
24-
- uses: actions/checkout@v2
24+
- uses: actions/checkout@v3
2525

2626
- name: Install packages
27-
run: sudo apt-get install -y binutils-dev libunwind8-dev libcurl4-openssl-dev libelf-dev libdw-dev cmake gcc libiberty-dev
27+
if: matrix.os == 'ubuntu-latest'
28+
run: sudo apt-get update -y && sudo apt-get install -y binutils-dev libunwind8-dev libcurl4-openssl-dev libelf-dev libdw-dev cmake gcc libiberty-dev
2829

2930
- name: Install toolchain
30-
uses: actions-rs/toolchain@v1
31+
uses: dtolnay/rust-toolchain@master
3132
with:
32-
profile: minimal
3333
toolchain: ${{ matrix.toolchain }}
34-
override: true
3534

3635
- name: Cargo build
3736
run: cargo build --verbose
@@ -46,10 +45,6 @@ jobs:
4645
if: matrix.toolchain == 'nightly'
4746
run: cargo check --verbose --no-default-features
4847

49-
- name: Cargo test w/ union
50-
if: matrix.toolchain == 'beta'
51-
run: cargo test --verbose --features union
52-
5348
- name: Cargo test all features
5449
if: matrix.toolchain == 'nightly'
5550
run: cargo test --verbose --all-features

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
name = "smallvec"
33
version = "1.9.0"
44
edition = "2018"
5+
rust-version = "1.57"
56
authors = ["The Servo Project Developers"]
67
license = "MIT OR Apache-2.0"
78
repository = "https://github.com/servo/rust-smallvec"

scripts/run_miri.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@ rustup component add miri
1717
cargo miri setup
1818

1919
cargo miri test --verbose
20-
cargo miri test --verbose --features union
2120
cargo miri test --verbose --all-features

0 commit comments

Comments
 (0)