Move to virtual workspace

ccliuyang · Dec 6, 2020 · 0df089a · 0df089a
1 parent 413ecc0
commit 0df089a
Show file tree

Hide file tree

Showing 61 changed files with 107 additions and 2,962 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,30 +31,20 @@ jobs:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}
           restore-keys: |
-            ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}-
+            ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}
             ${{ runner.os }}-cargo-
       - name: Cache cargo target dirs
         uses: actions/cache@v2
         with:
-          path: |
-            target
-            imgui-examples/target
-            imgui-gfx-examples/target
-            imgui-sys-bindgen/target
-          key: ${{ runner.os }}-target-lint-stable-${{ hashFiles('**/Cargo.toml') }}-${{ hashFiles('**/Cargo.lock') }}
+          path: target
+          key: ${{ runner.os }}-target-lint-stable-${{ hashFiles('**/Cargo.toml') }}
           restore-keys: |
-            ${{ runner.os }}-target-lint-stable-${{ hashFiles('**/Cargo.toml') }}-
+            ${{ runner.os }}-target-lint-stable-${{ hashFiles('**/Cargo.toml') }}
             ${{ runner.os }}-target-lint-stable-
             ${{ runner.os }}-target-lint-
-            ${{ runner.os }}-target-
       - run: cargo clippy --workspace --all-targets
-      # excluded crates
-      # ... why do only these two have lockfiles? Oh well, keep them up to date if they're in there...
-      - run: cargo clippy --manifest-path imgui-examples/Cargo.toml --all-targets --locked
-      - run: cargo clippy --manifest-path imgui-gfx-examples/Cargo.toml --all-targets --locked
-      - run: cargo clippy --manifest-path imgui-sys-bindgen/Cargo.toml --all-targets
       # supported winit versions
       - run: cargo clippy --manifest-path imgui-winit-support/Cargo.toml --all-features --all-targets
       - run: cargo clippy --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-19 --all-targets
@@ -78,12 +68,7 @@ jobs:
       - uses: hecrj/setup-rust-action@v1
         with:
           components: rustfmt
-      # workspace
       - run: cargo fmt --all -- --check
-      # excluded crates
-      - run: cargo fmt --manifest-path imgui-examples/Cargo.toml -- --check
-      - run: cargo fmt --manifest-path imgui-gfx-examples/Cargo.toml -- --check
-      - run: cargo fmt --manifest-path imgui-sys-bindgen/Cargo.toml -- --check
 
   test:
     name: Run tests
@@ -130,32 +115,23 @@ jobs:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}
           restore-keys: |
-            ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}-
+            ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}
             ${{ runner.os }}-cargo-
       - name: Cache cargo target dirs
         uses: actions/cache@v2
         with:
-          path: |
-            target
-            imgui-examples/target
-            imgui-gfx-examples/target
-            imgui-sys-bindgen/target
+          path: target
           # note `cargo test` and `cargo clippy` don't use the same build
           # artifacts, so this has a different key
-          key: ${{ runner.os }}-target-test-${{ matrix.rust }}-${{ hashFiles('**/Cargo.toml') }}-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-target-test-${{ matrix.rust }}-${{ hashFiles('**/Cargo.toml') }}
           restore-keys: |
-            ${{ runner.os }}-target-test-${{ matrix.rust }}-${{ hashFiles('**/Cargo.toml') }}-
+            ${{ runner.os }}-target-test-${{ matrix.rust }}-${{ hashFiles('**/Cargo.toml') }}
             ${{ runner.os }}-target-test-${{ matrix.rust }}-
-            ${{ runner.os }}-target-test-
-            ${{ runner.os }}-target-
-      - run: cargo test --all
-      - run: cargo test --manifest-path imgui-examples/Cargo.toml
-      - run: cargo test --manifest-path imgui-gfx-examples/Cargo.toml
-      - run: cargo test --manifest-path imgui-sys-bindgen/Cargo.toml
-      - run: cargo test --manifest-path imgui-gfx-examples/Cargo.toml --no-default-features --features directx
-        if: runner.os == 'Windows'
+      - run: cargo test --workspace
+      # - run: cargo test --manifest-path imgui-gfx-examples/Cargo.toml --no-default-features --features directx
+      #   if: runner.os == 'Windows'
       - run: cargo test --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-19
       - run: cargo test --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-20
       - run: cargo test --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-22

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,41 +1,11 @@
-[package]
-name = "imgui"
-version = "0.6.0"
-edition = "2018"
-authors = ["The imgui-rs Developers"]
-description = "High-level Rust bindings to dear imgui"
-homepage = "https://github.com/imgui-rs/imgui-rs"
-repository = "https://github.com/imgui-rs/imgui-rs"
-license = "MIT/Apache-2.0"
-categories = ["gui", "api-bindings"]
-readme = "README.markdown"
-
-exclude = [
-    "/resources"
-]
-
-[dependencies]
-bitflags = "1.0"
-glium = { version = "0.28", default-features = false, optional = true }
-gfx = { version = "0.18", optional = true }
-imgui-sys = { version = "0.6.0", path = "imgui-sys" }
-parking_lot = "0.11"
-
-[features]
-wasm = ["imgui-sys/wasm"]
-
-[dev-dependencies]
-memoffset = "0.6"
-
 [workspace]
 members = [
+    "imgui",
     "imgui-sys",
     "imgui-gfx-renderer",
     "imgui-glium-renderer",
-    "imgui-winit-support"
-]
-exclude = [
+    "imgui-winit-support",
     "imgui-examples",
     "imgui-gfx-examples",
-    "imgui-sys-bindgen"
+    "imgui-sys-bindgen",
 ]