Skip to content

Commit 924bffc

Browse files
committed
Simplify CI
We no longer use cargo-all-features in geo, and rstar doesn't currently have any features, so this strategy needlessly inflates our test times.
1 parent f75567e commit 924bffc

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

.github/workflows/test.yml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,21 @@ jobs:
3333
# giving us about 6 months of coverage.
3434
#
3535
# Minimum supported rust version (MSRV)
36-
- "georust/geo-ci:rust-1.63"
36+
- "ghcr.io/georust/geo-ci:rust-1.63"
3737
# Two most recent releases - we omit older ones for expedient CI
38-
- "georust/geo-ci:proj-9.2.1-rust-1.71"
39-
- "georust/geo-ci:proj-9.2.1-rust-1.72"
38+
- "ghcr.io/georust/geo-ci:proj-9.6.0-rust-1.83"
39+
- "ghcr.io/georust/geo-ci:proj-9.6.0-rust-1.84"
4040
container:
4141
image: ${{ matrix.container_image }}
4242
steps:
4343
- name: Checkout repository
4444
uses: actions/checkout@v4
45-
- run: cargo install --version 1.6.0 cargo-all-features
46-
- run: cargo build-all-features
47-
- run: cargo test-all-features
45+
- name: Setup Rust cache
46+
uses: Swatinem/rust-cache@v2
47+
with:
48+
key: ${{ matrix.container_image }}
49+
- run: cargo check --all-targets --workspace
50+
- run: cargo test --workspace
4851
- run: cargo build -p rstar-benches
4952

5053
check:
@@ -57,6 +60,8 @@ jobs:
5760
uses: dtolnay/rust-toolchain@stable
5861
with:
5962
components: clippy, rustfmt
63+
- name: Setup Rust cache
64+
uses: Swatinem/rust-cache@v2
6065
- name: Check formatting using Rustfmt
6166
run: cargo fmt --check
6267
- name: Lint using Clippy
@@ -74,6 +79,10 @@ jobs:
7479
uses: dtolnay/rust-toolchain@stable
7580
with:
7681
targets: ${{env.NO_STD_TARGET}}
82+
- name: Setup Rust cache
83+
uses: Swatinem/rust-cache@v2
84+
with:
85+
key: no-std-${{env.NO_STD_TARGET}}
7786
- name: Run cargo build for ${{env.NO_STD_TARGET}}
7887
run: cargo build --package rstar --target ${{env.NO_STD_TARGET}}
7988

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
target
2-
Cargo.lock
2+
Cargo.lock

0 commit comments

Comments
 (0)