Skip to content

Commit

Permalink
Merge branch 'refs/heads/main' into merge/vxastro
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/check_artifacts.yml
#	Cargo.lock
#	contracts/assembly/Cargo.toml
#	contracts/builder_unlock/Cargo.toml
#	contracts/escrow_fee_distributor/Cargo.toml
#	contracts/generator_controller/Cargo.toml
#	contracts/generator_controller_lite/Cargo.toml
#	contracts/hub/Cargo.toml
#	contracts/outpost/Cargo.toml
#	contracts/voting_escrow/Cargo.toml
#	contracts/voting_escrow_lite/Cargo.toml
#	packages/astroport-governance/Cargo.toml
#	packages/astroport-governance/src/lib.rs
#	packages/astroport-tests-lite/Cargo.toml
#	packages/astroport-tests/Cargo.toml
  • Loading branch information
epanchee committed Aug 20, 2024
2 parents c3f3de1 + 16c093e commit d9d6fa9
Show file tree
Hide file tree
Showing 267 changed files with 27,206 additions and 31,552 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check_artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@ jobs:
run: cargo install --debug --version 1.4.0 cosmwasm-check
- name: Cosmwasm check
run: |
cosmwasm-check $GITHUB_WORKSPACE/artifacts/*.wasm --available-capabilities staking,iterator,stargate,cosmwasm_1_1
cosmwasm-check $GITHUB_WORKSPACE/artifacts/*.wasm --available-capabilities staking,iterator,stargate,cosmwasm_1_1,neutron
6 changes: 6 additions & 0 deletions .github/workflows/tests_and_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,9 @@ jobs:
command: fmt
args: --all -- --check

- name: Generate and check schemas
run: |
$GITHUB_WORKSPACE/scripts/build_schemas.sh
git add -A $GITHUB_WORKSPACE/schemas # consider new contract schemas
git diff-index --cached HEAD --exit-code --
Loading

0 comments on commit d9d6fa9

Please sign in to comment.