Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

move cc-test & gen-windows-sys-binding into workspace #927

Merged
merged 1 commit into from
Jan 29, 2024
Merged

move cc-test & gen-windows-sys-binding into workspace #927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 9 additions & 13 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,9 @@ jobs:
sudo apt-get update
sudo apt-get install g++-multilib
if: matrix.build == 'linux32'
- run: cargo test ${{ matrix.no_run }}
- run: cargo test ${{ matrix.no_run }} --features parallel
- run: cargo test ${{ matrix.no_run }} --manifest-path cc-test/Cargo.toml --target ${{ matrix.target }}
- run: cargo test ${{ matrix.no_run }} --manifest-path cc-test/Cargo.toml --target ${{ matrix.target }} --features parallel
- run: cargo test ${{ matrix.no_run }} --manifest-path cc-test/Cargo.toml --target ${{ matrix.target }} --release
- run: cargo test ${{ matrix.no_run }} --workspace --target ${{ matrix.target }}
- run: cargo test ${{ matrix.no_run }} --workspace --target ${{ matrix.target }} --release
- run: cargo test ${{ matrix.no_run }} --workspace --target ${{ matrix.target }} --features parallel

check-tvos:
name: Test aarch64-apple-tvos
Expand All @@ -104,11 +102,9 @@ jobs:
rustup component add rust-src --toolchain nightly
rustup default nightly
shell: bash
- run: cargo test -Z build-std=std --no-run --target aarch64-apple-tvos
- run: cargo test -Z build-std=std --no-run --features parallel --target aarch64-apple-tvos
- run: cargo test -Z build-std=std --no-run --manifest-path cc-test/Cargo.toml --target aarch64-apple-tvos
- run: cargo test -Z build-std=std --no-run --manifest-path cc-test/Cargo.toml --target aarch64-apple-tvos --features parallel
- run: cargo test -Z build-std=std --no-run --manifest-path cc-test/Cargo.toml --target aarch64-apple-tvos --release
- run: cargo test -Z build-std=std --no-run --workspace --target aarch64-apple-tvos
- run: cargo test -Z build-std=std --no-run --workspace --target aarch64-apple-tvos --release
- run: cargo test -Z build-std=std --no-run --workspace --target aarch64-apple-tvos --features parallel

cuda:
name: Test CUDA support
Expand All @@ -126,7 +122,7 @@ jobs:
- name: Test 'cudart' feature
shell: bash
run: |
PATH="/usr/local/cuda/bin:$PATH" cargo test --manifest-path cc-test/Cargo.toml --features test_cuda
PATH="/usr/local/cuda/bin:$PATH" cargo test --manifest-path dev-tools/cc-test/Cargo.toml --features test_cuda

msrv:
name: MSRV
Expand All @@ -147,8 +143,8 @@ jobs:
run: cargo +nightly update -Zminimal-versions
- name: Cache downloaded crates since 1.53 is really slow in fetching
uses: Swatinem/rust-cache@v2
- run: cargo check --lib
- run: cargo check --lib --all-features
- run: cargo check --lib -p cc
- run: cargo check --lib -p cc --all-features

clippy:
name: Clippy
Expand Down
6 changes: 6 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,9 @@ parallel = []

[dev-dependencies]
tempfile = "3"

[workspace]
members = [
"dev-tools/cc-test",
"dev-tools/gen-windows-sys-binding",
]
2 changes: 1 addition & 1 deletion cc-test/Cargo.toml → dev-tools/cc-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ doctest = false
test = false

[build-dependencies]
cc = { path = ".." }
cc = { path = "../.." }
which = "^4.0"

[features]
Expand Down
0 cc-test/build.rs → dev-tools/cc-test/build.rs
View file
Open in desktop
File renamed without changes.
0 cc-test/src/NMakefile → dev-tools/cc-test/src/NMakefile
View file
Open in desktop
File renamed without changes.
0 cc-test/src/aarch64.S → dev-tools/cc-test/src/aarch64.S
View file
Open in desktop
File renamed without changes.
0 cc-test/src/aarch64.asm → dev-tools/cc-test/src/aarch64.asm
View file
Open in desktop
File renamed without changes.
0 cc-test/src/armv7.S → dev-tools/cc-test/src/armv7.S
View file
Open in desktop
File renamed without changes.
0 cc-test/src/bar1.c → dev-tools/cc-test/src/bar1.c
View file
Open in desktop
File renamed without changes.
0 cc-test/src/bar2.c → dev-tools/cc-test/src/bar2.c
View file
Open in desktop
File renamed without changes.
0 cc-test/src/baz.cpp → dev-tools/cc-test/src/baz.cpp
View file
Open in desktop
File renamed without changes.
0 cc-test/src/compile_error.c → dev-tools/cc-test/src/compile_error.c
View file
Open in desktop
File renamed without changes.
0 cc-test/src/cuda.cu → dev-tools/cc-test/src/cuda.cu
View file
Open in desktop
File renamed without changes.
0 cc-test/src/dummy.c → dev-tools/cc-test/src/dummy.c
View file
Open in desktop
File renamed without changes.
0 cc-test/src/expand.c → dev-tools/cc-test/src/expand.c
View file
Open in desktop
File renamed without changes.
0 cc-test/src/foo.c → dev-tools/cc-test/src/foo.c
View file
Open in desktop
File renamed without changes.
0 cc-test/src/i686.S → dev-tools/cc-test/src/i686.S
View file
Open in desktop
File renamed without changes.
0 cc-test/src/i686.asm → dev-tools/cc-test/src/i686.asm
View file
Open in desktop
File renamed without changes.
0 cc-test/src/include/foo.h → dev-tools/cc-test/src/include/foo.h
View file
Open in desktop
File renamed without changes.
0 cc-test/src/lib.rs → dev-tools/cc-test/src/lib.rs
View file
Open in desktop
File renamed without changes.
0 cc-test/src/msvc.c → dev-tools/cc-test/src/msvc.c
View file
Open in desktop
File renamed without changes.
0 cc-test/src/opt_linkage.c → dev-tools/cc-test/src/opt_linkage.c
View file
Open in desktop
File renamed without changes.
0 cc-test/src/riscv64gc.S → dev-tools/cc-test/src/riscv64gc.S
View file
Open in desktop
File renamed without changes.
0 cc-test/src/windows.c → dev-tools/cc-test/src/windows.c
View file
Open in desktop
File renamed without changes.
0 cc-test/src/x86_64.S → dev-tools/cc-test/src/x86_64.S
View file
Open in desktop
File renamed without changes.
0 cc-test/src/x86_64.asm → dev-tools/cc-test/src/x86_64.asm
View file
Open in desktop
File renamed without changes.
0 cc-test/tests/all.rs → dev-tools/cc-test/tests/all.rs
View file
Open in desktop
File renamed without changes.
0 cc-test/tests/output.rs → dev-tools/cc-test/tests/output.rs
View file
Open in desktop
File renamed without changes.
6 changes: 1 addition & 5 deletions gen-windows-sys-binding/Cargo.toml → dev-tools/gen-windows-sys-binding/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
[package]
name = "gen-windows-sys-binding"
version = "0.0.0"
edition = "2021"
edition = "2018"
publish = false

[dependencies]
windows-bindgen = "0.49"

# Prevent this from interfering with workspaces
[workspace]
members = ["."]
0 gen-windows-sys-binding/src/main.rs → ...tools/gen-windows-sys-binding/src/main.rs
View file
Open in desktop
File renamed without changes.
0 gen-windows-sys-binding/windows_sys.list → .../gen-windows-sys-binding/windows_sys.list
View file
Open in desktop
File renamed without changes.