Skip to content

Commit

Permalink
Revert "feat: merge original version 0.16.3 (#148)"
Browse files Browse the repository at this point in the history
This reverts commit 203d683.
  • Loading branch information
loloicci authored Feb 24, 2022
1 parent 203d683 commit 5f5e790
Show file tree
Hide file tree
Showing 168 changed files with 4,992 additions and 16,179 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/benchmarking.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.57.0
toolchain: 1.50.0
target: wasm32-unknown-unknown
profile: minimal
override: true
- name: Cache cargo
uses: actions/cache@v2
with:
path: ~/.cargo
key: cargocache-v2-benchmarking-rust:1.57.0-{{ checksum "Cargo.lock" }}
key: cargocache-v2-benchmarking-rust:1.50.0-{{ checksum "Cargo.lock" }}
- name: Version information
run: rustc --version; cargo --version; rustup --version; rustup target list --installed
- name: Run vm benchmarks (Singlepass)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.57.0
toolchain: 1.51.0
target: wasm32-unknown-unknown
profile: minimal
override: true
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
types: [closed]

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
jobs:
release:
runs-on: ubuntu-latest
Expand All @@ -20,10 +20,10 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.57.0
toolchain: 1.51.0
target: wasm32-unknown-unknown
profile: minimal
override: true
override: true
- name: Get version
id: get_version
run: |
Expand All @@ -37,6 +37,7 @@ jobs:
with:
version: ${{ steps.get_version.outputs.version }}
git_tag_prefix: v

- name: Create new tag
run: |
if [ -z "${{ steps.get_version.outputs.version }}" ]; then
Expand All @@ -56,12 +57,12 @@ jobs:
- name: Build development contracts
run: |
echo "Building all contracts under ./contracts"
docker run --volumes-from with_code cosmwasm/rust-optimizer:0.12.1 ./contracts/*/
docker run --volumes-from with_code cosmwasm/rust-optimizer:0.11.0 ./contracts/*/
- name: Check development contracts
working-directory: ./
run: |
echo "Checking all contracts under ./artifacts"
docker run --volumes-from with_code rust:1.54.0 /bin/bash -e -c 'cd ./code/packages/vm; ./examples/check_contract.sh ../../artifacts/*.wasm'
docker run --volumes-from with_code rust:1.51.0 /bin/bash -e -c 'cd ./code/packages/vm; ./examples/check_contract.sh ../../artifacts/*.wasm'
docker cp with_code:/code/artifacts .
- name: Create Release
Expand Down
60 changes: 30 additions & 30 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.57.0
toolchain: 1.51.0
target: wasm32-unknown-unknown
profile: minimal
override: true
- name: Cache cargo
uses: actions/cache@v2
with:
path: ~/.cargo
key: cargocache-v2-package_crypto-rust:1.57.0-${{ hashFiles('Cargo.lock') }}
key: cargocache-v2-package_crypto-rust:1.51.0-${{ hashFiles('Cargo.lock') }}
- name: Version information
run: rustc --version; cargo --version; rustup --version; rustup target list --installed
- name: Build
Expand All @@ -48,15 +48,15 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.57.0
toolchain: 1.51.0
target: wasm32-unknown-unknown
profile: minimal
override: true
- name: Cache cargo
uses: actions/cache@v2
with:
path: ~/.cargo
key: cargocache-v2-package_schema-rust:1.57.0-${{ hashFiles('Cargo.lock') }}
key: cargocache-v2-package_schema-rust:1.51.0-${{ hashFiles('Cargo.lock') }}
- name: Version information
run: rustc --version; cargo --version; rustup --version; rustup target list --installed
- name: Build
Expand All @@ -77,15 +77,15 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.57.0
toolchain: 1.51.0
target: wasm32-unknown-unknown
profile: minimal
override: true
- name: Cache cargo
uses: actions/cache@v2
with:
path: ~/.cargo
key: cargocache-v2-package_std-rust:1.57.0-${{ hashFiles('Cargo.lock') }}
key: cargocache-v2-package_std-rust:1.51.0-${{ hashFiles('Cargo.lock') }}
- name: Version information
run: rustc --version; cargo --version; rustup --version; rustup target list --installed
- name: Add wasm32 target
Expand Down Expand Up @@ -130,15 +130,15 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.57.0
toolchain: 1.51.0
target: wasm32-unknown-unknown
profile: minimal
override: true
- name: Cache cargo
uses: actions/cache@v2
with:
path: ~/.cargo
key: cargocache-v2-package_storage-rust:1.57.0-${{ hashFiles('Cargo.lock') }}
key: cargocache-v2-package_storage-rust:1.51.0-${{ hashFiles('Cargo.lock') }}
- name: Version information
run: rustc --version; cargo --version; rustup --version; rustup target list --installed
- name: Build library for native target
Expand All @@ -162,15 +162,15 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.57.0
toolchain: 1.51.0
target: wasm32-unknown-unknown
profile: minimal
override: true
- name: Cache cargo
uses: actions/cache@v2
with:
path: ~/.cargo
key: cargocache-v2-package_vm-rust:1.57.0-${{ hashFiles('Cargo.lock') }}
key: cargocache-v2-package_vm-rust:1.51.0-${{ hashFiles('Cargo.lock') }}
- name: Version information
run: rustc --version; cargo --version; rustup --version; rustup target list --installed
- name: Build
Expand All @@ -197,15 +197,15 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.57.0
toolchain: 1.51.0
target: wasm32-unknown-unknown
profile: minimal
override: true
- name: Cache cargo
uses: actions/cache@v2
with:
path: ~/.cargo
key: cargocache-v2-contract_burner-rust:1.57.0-${{ hashFiles('Cargo.lock') }}
key: cargocache-v2-contract_burner-rust:1.51.0-${{ hashFiles('Cargo.lock') }}
- name: Version information
run: rustc --version; cargo --version; rustup --version; rustup target list --installed
- name: Add wasm32 target
Expand Down Expand Up @@ -243,15 +243,15 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.57.0
toolchain: 1.51.0
target: wasm32-unknown-unknown
profile: minimal
override: true
- name: Cache cargo
uses: actions/cache@v2
with:
path: ~/.cargo
key: cargocache-v2-contract_crypto_verify-rust:1.57.0-${{ hashFiles('Cargo.lock') }}
key: cargocache-v2-contract_crypto_verify-rust:1.51.0-${{ hashFiles('Cargo.lock') }}
- name: Version information
run: rustc --version; cargo --version; rustup --version; rustup target list --installed
- name: Add wasm32 target
Expand Down Expand Up @@ -289,15 +289,15 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.57.0
toolchain: 1.51.0
target: wasm32-unknown-unknown
profile: minimal
override: true
- name: Cache cargo
uses: actions/cache@v2
with:
path: ~/.cargo
key: cargocache-v2-hackatom_verify-rust:1.57.0-${{ hashFiles('Cargo.lock') }}
key: cargocache-v2-hackatom_verify-rust:1.51.0-${{ hashFiles('Cargo.lock') }}
- name: Version information
run: rustc --version; cargo --version; rustup --version; rustup target list --installed
- name: Add wasm32 target
Expand Down Expand Up @@ -335,15 +335,15 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.57.0
toolchain: 1.51.0
target: wasm32-unknown-unknown
profile: minimal
override: true
- name: Cache cargo
uses: actions/cache@v2
with:
path: ~/.cargo
key: cargocache-v2-contract_ibc_reflect-rust:1.57.0-${{ hashFiles('Cargo.lock') }}
key: cargocache-v2-contract_ibc_reflect-rust:1.51.0-${{ hashFiles('Cargo.lock') }}
- name: Version information
run: rustc --version; cargo --version; rustup --version; rustup target list --installed
- name: Add wasm32 target
Expand Down Expand Up @@ -381,15 +381,15 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.57.0
toolchain: 1.51.0
target: wasm32-unknown-unknown
profile: minimal
override: true
- name: Cache cargo
uses: actions/cache@v2
with:
path: ~/.cargo
key: cargocache-v2-contract_ibc_reflect_send-rust:1.57.0-${{ hashFiles('Cargo.lock') }}
key: cargocache-v2-contract_ibc_reflect_send-rust:1.51.0-${{ hashFiles('Cargo.lock') }}
- name: Version information
run: rustc --version; cargo --version; rustup --version; rustup target list --installed
- name: Add wasm32 target
Expand Down Expand Up @@ -427,15 +427,15 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.57.0
toolchain: 1.51.0
target: wasm32-unknown-unknown
profile: minimal
override: true
- name: Cache cargo
uses: actions/cache@v2
with:
path: ~/.cargo
key: cargocache-v2-contract_queue-rust:1.57.0-${{ hashFiles('Cargo.lock') }}
key: cargocache-v2-contract_queue-rust:1.51.0-${{ hashFiles('Cargo.lock') }}
- name: Version information
run: rustc --version; cargo --version; rustup --version; rustup target list --installed
- name: Add wasm32 target
Expand Down Expand Up @@ -473,15 +473,15 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.57.0
toolchain: 1.51.0
target: wasm32-unknown-unknown
profile: minimal
override: true
- name: Cache cargo
uses: actions/cache@v2
with:
path: ~/.cargo
key: cargocache-v2-contract_reflect-rust:1.57.0-${{ hashFiles('Cargo.lock') }}
key: cargocache-v2-contract_reflect-rust:1.51.0-${{ hashFiles('Cargo.lock') }}
- name: Version information
run: rustc --version; cargo --version; rustup --version; rustup target list --installed
- name: Add wasm32 target
Expand Down Expand Up @@ -519,15 +519,15 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.57.0
toolchain: 1.51.0
target: wasm32-unknown-unknown
profile: minimal
override: true
- name: Cache cargo
uses: actions/cache@v2
with:
path: ~/.cargo
key: cargocache-v2-contract_staking-rust:1.57.0-${{ hashFiles('Cargo.lock') }}
key: cargocache-v2-contract_staking-rust:1.51.0-${{ hashFiles('Cargo.lock') }}
- name: Version information
run: rustc --version; cargo --version; rustup --version; rustup target list --installed
- name: Add wasm32 target
Expand Down Expand Up @@ -565,15 +565,15 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.57.0
toolchain: 1.51.0
target: wasm32-unknown-unknown
profile: minimal
override: true
- name: Cache cargo
uses: actions/cache@v2
with:
path: ~/.cargo
key: cargocache-v2-fmt-rust:1.57.0-${{ hashFiles('Cargo.lock') }}
key: cargocache-v2-fmt-rust:1.51.0-${{ hashFiles('Cargo.lock') }}
- name: Version information
run: rustc --version; cargo --version; rustup --version; rustup target list --installed
- name: Add rustfmt component
Expand Down Expand Up @@ -611,15 +611,15 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.57.0
toolchain: 1.51.0
target: wasm32-unknown-unknown
profile: minimal
override: true
- name: Cache cargo
uses: actions/cache@v2
with:
path: ~/.cargo
key: cargocache-v2-clippy-rust:1.57.0-${{ hashFiles('Cargo.lock') }}
key: cargocache-v2-clippy-rust:1.51.0-${{ hashFiles('Cargo.lock') }}
- name: Version information
run: rustc --version; cargo --version; rustup --version; rustup target list --installed
- name: Add clippy component
Expand Down
1 change: 0 additions & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ pull_request_rules:
- "status-success=ci/circleci: contract_hackatom"
- "status-success=ci/circleci: contract_ibc_reflect"
- "status-success=ci/circleci: contract_ibc_reflect_send"
- "status-success=ci/circleci: contract_floaty"
- "status-success=ci/circleci: contract_queue"
- "status-success=ci/circleci: contract_reflect"
- "status-success=ci/circleci: contract_staking"
Expand Down
9 changes: 1 addition & 8 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
{
"overrides": [
{
"files": "*.md",
"options": {
"proseWrap": "always"
}
}
]
"proseWrap": "always"
}
Loading

0 comments on commit 5f5e790

Please sign in to comment.