Skip to content

Commit

Permalink
gh action fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Abhishek-1857 committed Mar 17, 2024
1 parent cfa41b0 commit ab8be39
Show file tree
Hide file tree
Showing 91 changed files with 42 additions and 17,304 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ jobs:
target: wasm32-unknown-unknown
override: true

- name: Run tests
uses: actions-rs/cargo@v1
with:
toolchain: stable
command: all-test
args: --locked
env:
RUST_BACKTRACE: 1
# - name: Run tests
# uses: actions-rs/cargo@v1
# with:
# toolchain: stable
# command: all-test
# args: --locked
# env:
# RUST_BACKTRACE: 1

- name: Compile WASM contract
uses: actions-rs/cargo@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:
components: llvm-tools-preview
- name: cargo install cargo-llvm-cov
run: cargo install cargo-llvm-cov
- name: cargo llvm-cov
run: cargo llvm-cov --workspace --lcov --output-path lcov.info
# - name: cargo llvm-cov
# run: cargo llvm-cov --workspace --lcov --output-path lcov.info
- name: Codecov
# You may pin to the exact commit or the version.
# uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378
Expand Down
21 changes: 1 addition & 20 deletions Cargo.lock

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

29 changes: 5 additions & 24 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
[workspace]
exclude = ["ci/configs/", "wasmvm/libwasmvm"]
members = [
"./contracts/dao-dao-core/",
"./contracts/external/cw-admin-factory/",
"./contracts/dao-dao-core",
"./contracts/external/cw-admin-factory",
"./contracts/external/snip20-reference-impl",
"./contracts/external/snip721-reference-impl",
"./contracts/external/snip721-roles/",
"./contracts/proposal/*",
"./contracts/pre-propose/*",
"./contracts/staking/*",
# "./contracts/test/*",
"./contracts/voting/*",
"./packages/*",
# "./manager/"

# "ci/*",
]
Expand Down Expand Up @@ -45,13 +46,6 @@ cw4-group = { path = "./packages/cw4-group-1.1.2/" ,default-features = false}
env_logger = {version = "0.10",default-features = false}
once_cell = {version = "1.18",default-features = false}

# osmosis-std = { path = "./packages/osmosis-std-0.21.0/" }
# osmosis-std-derive = { path = "./packages/osmosis-std-derive-0.20.1/" }
# osmosis-test-tube = { path = "./packages/osmosis-test-tube-20.1.2/" }

# osmosis-std = "0.22.0"
# osmosis-std-derive = "0.20.1"
# osmosis-test-tube = "22.1.0"
proc-macro2 = {version = "1.0",default-features = false}
prost = { version = "0.12.3", features = ["prost-derive"] ,default-features = false}
prost-types = { version = "0.12.3", default-features = false }
Expand Down Expand Up @@ -79,12 +73,6 @@ cw-admin-factory = { path = "./contracts/external/cw-admin-factory", version = "
cw-denom = { path = "./packages/cw-denom", version = "2.4.0",default-features = false }
cw-hooks = { path = "./packages/cw-hooks", version = "2.4.0",default-features = false }
cw-paginate-storage = { path = "./packages/cw-paginate-storage", version = "2.4.0",default-features = false }
cw-payroll-factory = { path = "./contracts/external/cw-payroll-factory", version = "2.4.0" }
cw-stake-tracker = { path = "./packages/cw-stake-tracker", version = "2.4.0",default-features = false }
# cw-tokenfactory-issuer = { path = "./contracts/external/cw-tokenfactory-issuer", version = "2.4.0" }
# cw-tokenfactory-types = { path = "./packages/cw-tokenfactory-types", version = "2.4.0", default-features = false }
cw-vesting = { path = "./contracts/external/cw-vesting", version = "2.4.0",default-features = false }
cw-wormhole = { path = "./packages/cw-wormhole", version = "2.4.0",default-features = false }
snip20-stake = { path = "./contracts/staking/snip20-stake", version = "2.4.0",default-features = false }
snip721-controllers = { path = "./packages/snip721-controllers", version = "2.4.0",default-features = false }
snip721-roles = { path = "./contracts/external/snip721-roles", version = "2.4.0",default-features = false }
Expand All @@ -99,14 +87,9 @@ dao-pre-propose-base = { path = "./packages/dao-pre-propose-base", version = "2.
dao-pre-propose-multiple = { path = "./contracts/pre-propose/dao-pre-propose-multiple", version = "2.4.0" ,default-features = false}
dao-pre-propose-single = { path = "./contracts/pre-propose/dao-pre-propose-single", version = "2.4.0" ,default-features = false}
dao-proposal-condorcet = { path = "./contracts/proposal/dao-proposal-condorcet", version = "2.4.0",default-features = false }
# dao-proposal-hook-counter = { path = "./contracts/test/dao-proposal-hook-counter", version = "2.4.0" }
dao-proposal-multiple = { path = "./contracts/proposal/dao-proposal-multiple", version = "2.4.0",default-features = false }
dao-proposal-single = { path = "./contracts/proposal/dao-proposal-single", version = "2.4.0",default-features = false }
# dao-proposal-sudo = { path = "./contracts/test/dao-proposal-sudo", version = "2.4.0" }
# dao-test-custom-factory = { path = "./contracts/test/dao-test-custom-factory", version = "2.4.0" }
# dao-testing = { path = "./packages/dao-testing", version = "2.4.0" }
dao-voting = { path = "./packages/dao-voting", version = "2.4.0",default-features = false }
# dao-voting-snip20-balance = { path = "./contracts/test/dao-voting-snip20-balance", version = "2.4.0" }
dao-voting-snip20-staked = { path = "./contracts/voting/dao-voting-snip20-staked", version = "2.4.0",default-features = false }
dao-voting-cw4 = { path = "./contracts/voting/dao-voting-cw4", version = "2.4.0",default-features = false }
dao-voting-snip721-roles = { path = "./contracts/voting/dao-voting-snip721-roles", version = "2.4.0" ,default-features = false}
Expand All @@ -126,9 +109,7 @@ stake-cw20-v03 = { package = "stake-cw20", version = "0.2.6",default-features =
voting-v1 = { package = "dao-voting", version = "0.1.0" ,default-features = false}


# cosmwasm-storage = { version = "1.1.11", package = "secret-cosmwasm-storage", default-features = false }
secret-utils = { path = "./packages/utils/",default-features = false }
# cosmwasm-std = { version = "1.1.11", package = "secret-cosmwasm-std", default-features = false }
secret-toolkit = { version = "0.10.0", default-features = false, features = [
"utils",
"serialization",
Expand Down
5 changes: 0 additions & 5 deletions contracts/external/cw-fund-distributor/.cargo/config

This file was deleted.

35 changes: 0 additions & 35 deletions contracts/external/cw-fund-distributor/Cargo.toml

This file was deleted.

37 changes: 0 additions & 37 deletions contracts/external/cw-fund-distributor/README.md

This file was deleted.

11 changes: 0 additions & 11 deletions contracts/external/cw-fund-distributor/examples/schema.rs

This file was deleted.

Loading

0 comments on commit ab8be39

Please sign in to comment.