Skip to content

Commit

Permalink
Some more corrections and remove deps
Browse files Browse the repository at this point in the history
  • Loading branch information
Kayanski committed Nov 27, 2024
1 parent 02a8439 commit 00f8e71
Show file tree
Hide file tree
Showing 23 changed files with 128 additions and 256 deletions.
30 changes: 9 additions & 21 deletions .github/workflows/framework-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ on:
paths:
- "framework/**"
pull_request:
paths:
paths:
- "framework/**"

env:
env:
SCCACHE_GHA_ENABLED: "true"
RUSTC_WRAPPER: "sccache"

Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
toolchain: ${{ matrix.toolchain }}
components: clippy
- uses: Swatinem/rust-cache@v2
with:
with:
workspaces: "framework -> target"
- name: cargo clippy
working-directory: ./framework
Expand Down Expand Up @@ -112,8 +112,8 @@ jobs:
- name: cargo install cargo-hack
uses: taiki-e/install-action@cargo-hack
- uses: Swatinem/rust-cache@v2
with:
workspaces: "framework -> target"
with:
workspaces: "framework -> target"
- name: cargo hack
working-directory: ./framework
run: cargo hack --feature-powerset check --lib --tests
Expand All @@ -125,24 +125,12 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- uses: webfactory/[email protected]
with:
ssh-private-key: |
${{ secrets.SSH_PRIVATE_KEY_MULTI_TEST }}
${{ secrets.SSH_PRIVATE_KEY_CW_ORCH_INTERCHAIN }}
- name: Setup sccache
uses: mozilla-actions/[email protected]
with:
version: "v0.8.1"
- name: Install nightly
uses: dtolnay/rust-toolchain@nightly
- name: cargo install cargo-udeps
uses: taiki-e/install-action@cargo-udeps
- name: cargo install cargo-workspaces
run: cargo +stable install cargo-workspaces
- uses: Swatinem/rust-cache@v2
with:
workspaces: "framework -> target"
- name: cargo udeps framework
working-directory: ./framework
run: cargo workspaces exec cargo +nightly udeps --workspace --exclude "workspace-hack"
with:
workspaces: "framework -> target"
- name: Machete
uses: bnjbvr/cargo-machete@main
59 changes: 0 additions & 59 deletions framework/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions framework/contracts/account/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,10 @@ abstract-sdk = { workspace = true }
abstract-std = { workspace = true }
cosmwasm-schema = { workspace = true }
cosmwasm-std = { workspace = true }
cw-asset = { workspace = true }
cw-controllers = { workspace = true }
cw-storage-plus = { workspace = true }
cw2 = { workspace = true }
cw20 = { workspace = true }
schemars = { workspace = true }
semver = { workspace = true }
serde = { workspace = true }
thiserror = { workspace = true }

abstract-ica = { workspace = true }
Expand Down
2 changes: 0 additions & 2 deletions framework/contracts/native/ans-host/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,10 @@ abstract-sdk = { workspace = true }
abstract-std = { workspace = true }
cosmwasm-std = { workspace = true }
cw-asset = { workspace = true }
cw-controllers = { workspace = true }
cw-ownable = { workspace = true }
cw-storage-plus = { workspace = true }
cw2 = { workspace = true }
semver = { workspace = true }
serde = { workspace = true }
thiserror = { workspace = true }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
Expand Down
4 changes: 2 additions & 2 deletions framework/contracts/native/ibc-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ cw-storage-plus = { workspace = true }
cw-utils = { workspace = true }
cw2 = { workspace = true }
semver = { workspace = true }
serde = { workspace = true }
thiserror = { workspace = true }

thiserror = { workspace = true }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
workspace-hack = { version = "0.1", path = "../../../workspace-hack" }
Expand Down
Loading

0 comments on commit 00f8e71

Please sign in to comment.