diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 32eb273d..75e11e36 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -202,136 +202,136 @@ jobs: matrix: config: - package: default - test-bin: ./result/bin/foo + test-bin: ./result/bin/complex-foo - package: rust-complex - test-bin: ./result/bin/foo + test-bin: ./result/bin/complex-foo - package: rust-complex-aarch64-apple-darwin - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo # TODO: Enable #- package: rust-complex-aarch64-apple-ios - # test-bin: file ./result/bin/foo + # test-bin: file ./result/bin/complex-foo - package: rust-complex-aarch64-linux-android - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-aarch64-unknown-linux-gnu - test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-aarch64 ./result/bin/foo + test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-aarch64 ./result/bin/complex-foo - package: rust-complex-aarch64-unknown-linux-musl - test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-aarch64 ./result/bin/foo + test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-aarch64 ./result/bin/complex-foo - package: rust-complex-arm-unknown-linux-gnueabihf - test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-arm ./result/bin/foo + test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-arm ./result/bin/complex-foo - package: rust-complex-arm-unknown-linux-musleabihf - test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-arm ./result/bin/foo + test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-arm ./result/bin/complex-foo - package: rust-complex-armv7-unknown-linux-gnueabihf - test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-arm ./result/bin/foo + test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-arm ./result/bin/complex-foo - package: rust-complex-armv7-unknown-linux-musleabihf - test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-arm ./result/bin/foo + test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-arm ./result/bin/complex-foo # TODO: Enable #- package: rust-complex-powerpc64-unknown-linux-gnu - # test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-ppc64 ./result/bin/foo + # test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-ppc64 ./result/bin/complex-foo - package: rust-complex-powerpc64le-unknown-linux-gnu - test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-ppc64le ./result/bin/foo + test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-ppc64le ./result/bin/complex-foo - package: rust-complex-riscv64gc-unknown-linux-gnu - test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-riscv64 ./result/bin/foo + test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-riscv64 ./result/bin/complex-foo - package: rust-complex-s390x-unknown-linux-gnu - test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-s390x ./result/bin/foo + test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-s390x ./result/bin/complex-foo - package: rust-complex-x86_64-apple-darwin - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-x86_64-pc-windows-gnu - test-bin: nix shell --inputs-from . 'nixpkgs#wine64' -c wine64 ./result/bin/foo.exe + test-bin: nix shell --inputs-from . 'nixpkgs#wine64' -c wine64 ./result/bin/complex-foo.exe suffix: .exe - package: rust-complex-x86_64-unknown-linux-gnu - test-bin: ./result/bin/foo + test-bin: ./result/bin/complex-foo - package: rust-complex-x86_64-unknown-linux-musl - test-bin: ./result/bin/foo + test-bin: ./result/bin/complex-foo - package: rust-complex-wasm32-unknown-unknown - test-bin: nix run --inputs-from . 'nixpkgs#wasmtime' ./result/bin/foo.wasm + test-bin: nix run --inputs-from . 'nixpkgs#wasmtime' ./result/bin/complex-foo.wasm suffix: .wasm - package: rust-complex-wasm32-wasip2 - test-bin: nix run --inputs-from . 'nixpkgs#wasmtime' ./result/bin/foo.wasm + test-bin: nix run --inputs-from . 'nixpkgs#wasmtime' ./result/bin/complex-foo.wasm suffix: .wasm - package: rust-complex-debug - test-bin: ./result/bin/foo + test-bin: ./result/bin/complex-foo - package: rust-complex-debug-aarch64-apple-darwin - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo # TODO: Enable #- package: rust-complex-debug-aarch64-apple-ios - # test-bin: file ./result/bin/foo + # test-bin: file ./result/bin/complex-foo - package: rust-complex-debug-aarch64-linux-android - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-debug-aarch64-unknown-linux-gnu - test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-aarch64 ./result/bin/foo + test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-aarch64 ./result/bin/complex-foo - package: rust-complex-debug-aarch64-unknown-linux-musl - test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-aarch64 ./result/bin/foo + test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-aarch64 ./result/bin/complex-foo - package: rust-complex-debug-arm-unknown-linux-gnueabihf - test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-arm ./result/bin/foo + test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-arm ./result/bin/complex-foo - package: rust-complex-debug-arm-unknown-linux-musleabihf - test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-arm ./result/bin/foo + test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-arm ./result/bin/complex-foo - package: rust-complex-debug-armv7-unknown-linux-gnueabihf - test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-arm ./result/bin/foo + test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-arm ./result/bin/complex-foo - package: rust-complex-debug-armv7-unknown-linux-musleabihf - test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-arm ./result/bin/foo + test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-arm ./result/bin/complex-foo # TODO: Enable #- package: rust-complex-debug-powerpc64-unknown-linux-gnu - # test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-ppc64 ./result/bin/foo + # test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-ppc64 ./result/bin/complex-foo - package: rust-complex-debug-powerpc64le-unknown-linux-gnu - test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-ppc64le ./result/bin/foo + test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-ppc64le ./result/bin/complex-foo - package: rust-complex-debug-riscv64gc-unknown-linux-gnu - test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-riscv64 ./result/bin/foo + test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-riscv64 ./result/bin/complex-foo - package: rust-complex-debug-s390x-unknown-linux-gnu - test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-s390x ./result/bin/foo + test-bin: nix shell --inputs-from . 'nixpkgs#qemu' -c qemu-s390x ./result/bin/complex-foo - package: rust-complex-debug-x86_64-apple-darwin - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-debug-x86_64-pc-windows-gnu - test-bin: nix shell --inputs-from . 'nixpkgs#wine64' -c wine64 ./result/bin/foo.exe + test-bin: nix shell --inputs-from . 'nixpkgs#wine64' -c wine64 ./result/bin/complex-foo.exe suffix: .exe - package: rust-complex-debug-x86_64-unknown-linux-gnu - test-bin: ./result/bin/foo + test-bin: ./result/bin/complex-foo - package: rust-complex-debug-x86_64-unknown-linux-musl - test-bin: ./result/bin/foo + test-bin: ./result/bin/complex-foo - package: rust-complex-debug-wasm32-unknown-unknown - test-bin: nix run --inputs-from . 'nixpkgs#wasmtime' ./result/bin/foo.wasm + test-bin: nix run --inputs-from . 'nixpkgs#wasmtime' ./result/bin/complex-foo.wasm suffix: .wasm - package: rust-complex-debug-wasm32-wasip2 - test-bin: nix run --inputs-from . 'nixpkgs#wasmtime' ./result/bin/foo.wasm + test-bin: nix run --inputs-from . 'nixpkgs#wasmtime' ./result/bin/complex-foo.wasm suffix: .wasm runs-on: ubuntu-latest @@ -344,7 +344,7 @@ jobs: with: package: ${{ matrix.config.package }} flake: ./examples/rust-complex - install-path: /bin/foo${{ matrix.config.suffix }} + install-path: /bin/complex-foo${{ matrix.config.suffix }} prefix: linux - run: ${{ matrix.config.test-bin }} @@ -353,102 +353,102 @@ jobs: matrix: config: - package: default - test-bin: ./result/bin/foo + test-bin: ./result/bin/complex-foo - package: rust-complex - test-bin: ./result/bin/foo + test-bin: ./result/bin/complex-foo - package: rust-complex-aarch64-apple-darwin - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-aarch64-unknown-linux-musl - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-arm-unknown-linux-gnueabihf - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-arm-unknown-linux-musleabihf - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-armv7-unknown-linux-gnueabihf - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-armv7-unknown-linux-musleabihf - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-powerpc64le-unknown-linux-gnu - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-riscv64gc-unknown-linux-gnu - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-s390x-unknown-linux-gnu - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-x86_64-apple-darwin - test-bin: ./result/bin/foo + test-bin: ./result/bin/complex-foo - package: rust-complex-x86_64-pc-windows-gnu - test-bin: file ./result/bin/foo.exe + test-bin: file ./result/bin/complex-foo.exe suffix: .exe - package: rust-complex-x86_64-unknown-linux-musl - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-wasm32-unknown-unknown - test-bin: nix run --inputs-from . 'nixpkgs#wasmtime' ./result/bin/foo.wasm + test-bin: nix run --inputs-from . 'nixpkgs#wasmtime' ./result/bin/complex-foo.wasm suffix: .wasm - package: rust-complex-wasm32-wasip2 - test-bin: nix run --inputs-from . 'nixpkgs#wasmtime' ./result/bin/foo.wasm + test-bin: nix run --inputs-from . 'nixpkgs#wasmtime' ./result/bin/complex-foo.wasm suffix: .wasm - package: rust-complex-debug - test-bin: ./result/bin/foo + test-bin: ./result/bin/complex-foo - package: rust-complex-debug-aarch64-apple-darwin - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-debug-aarch64-unknown-linux-musl - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-debug-arm-unknown-linux-gnueabihf - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-debug-arm-unknown-linux-musleabihf - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-debug-armv7-unknown-linux-gnueabihf - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-debug-armv7-unknown-linux-musleabihf - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-debug-powerpc64le-unknown-linux-gnu - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-debug-riscv64gc-unknown-linux-gnu - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-debug-s390x-unknown-linux-gnu - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-debug-x86_64-apple-darwin - test-bin: ./result/bin/foo + test-bin: ./result/bin/complex-foo - package: rust-complex-debug-x86_64-pc-windows-gnu - test-bin: file ./result/bin/foo.exe + test-bin: file ./result/bin/complex-foo.exe suffix: .exe - package: rust-complex-debug-x86_64-unknown-linux-musl - test-bin: file ./result/bin/foo + test-bin: file ./result/bin/complex-foo - package: rust-complex-debug-wasm32-unknown-unknown - test-bin: nix run --inputs-from . 'nixpkgs#wasmtime' ./result/bin/foo.wasm + test-bin: nix run --inputs-from . 'nixpkgs#wasmtime' ./result/bin/complex-foo.wasm suffix: .wasm - package: rust-complex-debug-wasm32-wasip2 - test-bin: nix run --inputs-from . 'nixpkgs#wasmtime' ./result/bin/foo.wasm + test-bin: nix run --inputs-from . 'nixpkgs#wasmtime' ./result/bin/complex-foo.wasm suffix: .wasm runs-on: macos-latest @@ -461,7 +461,7 @@ jobs: with: package: ${{ matrix.config.package }} flake: ./examples/rust-complex - install-path: /bin/foo${{ matrix.config.suffix }} + install-path: /bin/complex-foo${{ matrix.config.suffix }} prefix: macos - run: ${{ matrix.config.test-bin }} diff --git a/examples/rust-complex/Cargo.lock b/examples/rust-complex/Cargo.lock index 8b773385..1ff45707 100644 --- a/examples/rust-complex/Cargo.lock +++ b/examples/rust-complex/Cargo.lock @@ -21,7 +21,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "foo" +name = "complex-foo" version = "0.1.0" [[package]] @@ -101,7 +101,7 @@ dependencies = [ name = "rust-complex" version = "0.1.0" dependencies = [ - "foo", + "complex-foo", "ring", "rust-complex", ] diff --git a/examples/rust-complex/Cargo.toml b/examples/rust-complex/Cargo.toml index ddb4b7a5..372bc4ad 100644 --- a/examples/rust-complex/Cargo.toml +++ b/examples/rust-complex/Cargo.toml @@ -8,15 +8,15 @@ version = "0.1.0" edition = "2021" [dependencies] -foo = { workspace = true } +complex-foo = { workspace = true } ring = { workspace = true } [target.'cfg(windows)'.dependencies] -foo = { workspace = true, features = ["windows"] } +complex-foo = { workspace = true, features = ["windows"] } [dev-dependencies] rust-complex = { path = "." } [workspace.dependencies] -foo = { path = "./foo" } +complex-foo = { path = "./foo" } ring = { version = "0.17", features = ["wasm32_unknown_unknown_js"] } diff --git a/examples/rust-complex/foo/Cargo.toml b/examples/rust-complex/foo/Cargo.toml index 0a358fac..89819354 100644 --- a/examples/rust-complex/foo/Cargo.toml +++ b/examples/rust-complex/foo/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "foo" +name = "complex-foo" version = "0.1.0" edition = "2021"