Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,13 @@ jobs:
- uses: actions/checkout@v7.0.1

- name: Check for typos
uses: crate-ci/typos@v1.48.0
uses: crate-ci/typos@v1.50.1

- name: Check formatting
run: cargo fmt --all -- --check

- name: Install tombi
uses: tombi-toml/setup-tombi@v1.2.4
uses: tombi-toml/setup-tombi@v1.4

- name: Check for tombi
run: tombi lint --error-on-warnings; tombi format --check --diff
Expand Down Expand Up @@ -68,7 +71,6 @@ jobs:
key: build-${{ matrix.os }}-${{ env.CACHE_SUFFIX }}
env-vars: ImageVersion
cache-bin: false
save-if: ${{ github.ref == 'refs/heads/master' }}

- name: Clippy no features
run: cargo clippy --workspace --all-targets --no-default-features -- -Dwarnings
Expand Down Expand Up @@ -117,7 +119,6 @@ jobs:
key: build-wasm-${{ matrix.os }}-${{ env.CACHE_SUFFIX }}
env-vars: ImageVersion
cache-bin: false
save-if: ${{ github.ref == 'refs/heads/master' }}

- name: Clippy no features
run: cargo clippy --workspace --all-targets --no-default-features -- -Dwarnings
Expand Down Expand Up @@ -158,10 +159,9 @@ jobs:
key: build-android-${{ matrix.os }}-${{ env.CACHE_SUFFIX }}
env-vars: ImageVersion
cache-bin: false
save-if: ${{ github.ref == 'refs/heads/master' }}

- name: Install cargo-binstall
uses: cargo-bins/cargo-binstall@v1.21.1
uses: cargo-bins/cargo-binstall@v1.22.0

- name: Install Android NDK
run: ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager 'ndk;${{env.ANDROID_NDK_VERSION}}'
Expand Down
13 changes: 2 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,8 @@ rustdoc-args = ["--cfg", "docsrs"]
members = ["derive", "tests"]

[dependencies]
const_shader_layout_derive = {
path = "./derive",
version = "0.2.1",
optional = true
}
glam = {
version = "0.33",
default-features = false,
features = ["i16", "i32", "u16", "u32"],
optional = true
}
const_shader_layout_derive = { path = "./derive", version = "0.2.1", optional = true }
glam = { version = "0.33", default-features = false, features = ["i16", "i32", "u16", "u32"], optional = true }
half = { version = "2", default-features = false, optional = true }

[features]
Expand Down
5 changes: 1 addition & 4 deletions tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@ harness = false
name = "ui"

[dependencies]
const_shader_layout = {
path = "..",
features = ["derive", "glam", "half", "std"]
}
const_shader_layout = { path = "..", features = ["derive", "glam", "half", "std"] }
glam = {
version = "0.33",
default-features = false,
Expand Down