Skip to content

Deps and workflow #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 6, 2023
Merged

Deps and workflow #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8fcd01
Bump deps.
piobab Aug 5, 2023
7faf148
Remove artifacts workflow.
piobab Aug 5, 2023
0003778
Fix docker for optimizer.
piobab Aug 6, 2023
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
25 changes: 0 additions & 25 deletions .github/workflows/artifacts.yml
View file
Open in desktop

This file was deleted.

40 changes: 31 additions & 9 deletions Cargo.lock
View file
Open in desktop

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

24 changes: 12 additions & 12 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,32 +42,32 @@ keywords = [
]

[workspace.dependencies]
anyhow = "1.0.71"
anyhow = "1.0.72"
bech32 = "0.9.1"
cosmwasm-schema = "1.2.6"
cosmwasm-schema = "1.3.1"
cosmwasm-std = "1.3.1"
cw2 = "1.1.0"
cw-storage-plus = "1.0.1"
cw-storage-plus = "1.1.0"
cw-utils = "1.0.1"
mars-owner = { version = "1.2.0", features = ["emergency-owner"] }
mars-owner = { version = "2.0.0", features = ["emergency-owner"] }
osmosis-std = "0.16.1"
prost = { version = "0.11.5", default-features = false, features = ["prost-derive"] }
prost = { version = "0.11.9", default-features = false, features = ["prost-derive"] }
schemars = "0.8.12"
serde = { version = "1.0.163", default-features = false, features = ["derive"] }
thiserror = "1.0.40"
pyth-sdk-cw = "1.2.0"
serde = { version = "1.0.181", default-features = false, features = ["derive"] }
thiserror = "1.0.44"
pyth-sdk-cw = "1.2.0"
cw-paginate = "0.2.1"
astroport = "2.8.0"
strum = "0.24.1"
neutron-sdk = "0.6.0"
strum = "0.25.0"
neutron-sdk = "0.6.1"
serde_json = "1.0"

# dev-dependencies
cw-multi-test = "0.16.5"
cw-it = "0.1.0"
osmosis-test-tube = "=16.1.1"
test-case = "3.0.0"
proptest = "1.1.0"
test-case = "3.1.0"
proptest = "1.2.0"

# packages
mars-health = { path = "./packages/health" }
Expand Down
4 changes: 2 additions & 2 deletions Makefile.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ default_to_workspace = false
# Directory with wasm files used by integration tests (another directory can be used instead, for example 'artifacts' from rust-optimizer)
ARTIFACTS_DIR_PATH = "target/wasm32-unknown-unknown/release"
# If you bump this version, verify RUST_VERSION correctness
RUST_OPTIMIZER_VERSION = "0.12.13"
RUST_OPTIMIZER_VERSION = "0.13.0"
# Use rust version from rust-optimizer Dockerfile (see https://github.com/CosmWasm/rust-optimizer/blob/main/Dockerfile#L1)
# to be sure that we compile / test against the same version
RUST_VERSION = "1.69.0"
Expand Down Expand Up @@ -44,7 +44,7 @@ else
image="cosmwasm/workspace-optimizer:${RUST_OPTIMIZER_VERSION}"
fi
docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
${image}
"""
Expand Down