Skip to content

Commit

Permalink
Merge branch 'refs/heads/main' into merge/features_190624
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/check_artifacts.yml
#	Cargo.toml
#	contracts/periphery/liquidity_manager/src/utils.rs
  • Loading branch information
epanchee committed Jun 19, 2024
2 parents a0a71af + a32c1f9 commit 82a1532
Show file tree
Hide file tree
Showing 155 changed files with 7,653 additions and 9,483 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check_artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
-v "$GITHUB_WORKSPACE":/code \
-v ~/.cargo/registry:/usr/local/cargo/registry \
-v ~/.cargo/git:/usr/local/cargo/git \
cosmwasm/workspace-optimizer:0.15.1
ghcr.io/astroport-fi/rust-optimizer:v0.15.1-astroport
- name: Save artifacts cache
uses: actions/cache/save@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_and_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: test
args: --no-fail-fast --locked
args: --features tests-tube --no-fail-fast --locked
env:
RUST_BACKTRACE: 1

Expand Down
Loading

0 comments on commit 82a1532

Please sign in to comment.