Skip to content

Commit e372c07

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix/account-trace-serialization
2 parents d191760 + ca2270a commit e372c07

File tree

183 files changed

+2747
-1505
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+2747
-1505
lines changed

.github/workflows/framework-check.yml

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ on:
77
paths:
88
- "framework/**"
99
pull_request:
10-
paths:
10+
paths:
1111
- "framework/**"
1212

13-
env:
13+
env:
1414
SCCACHE_GHA_ENABLED: "true"
1515
RUSTC_WRAPPER: "sccache"
1616

@@ -63,7 +63,7 @@ jobs:
6363
toolchain: ${{ matrix.toolchain }}
6464
components: clippy
6565
- uses: Swatinem/rust-cache@v2
66-
with:
66+
with:
6767
workspaces: "framework -> target"
6868
- name: cargo clippy
6969
working-directory: ./framework
@@ -112,37 +112,30 @@ jobs:
112112
- name: cargo install cargo-hack
113113
uses: taiki-e/install-action@cargo-hack
114114
- uses: Swatinem/rust-cache@v2
115-
with:
116-
workspaces: "framework -> target"
115+
with:
116+
workspaces: "framework -> target"
117117
- name: cargo hack
118118
working-directory: ./framework
119119
run: cargo hack --feature-powerset check --lib --tests
120120
# Find any unused dependencies
121121
unused-deps:
122122
runs-on: ubuntu-latest
123-
name: nigtly / unused-deps
123+
name: stable / unused-deps
124124
steps:
125125
- uses: actions/checkout@v3
126126
with:
127127
submodules: true
128-
- uses: webfactory/ssh-agent@v0.8.0
129-
with:
130-
ssh-private-key: |
131-
${{ secrets.SSH_PRIVATE_KEY_MULTI_TEST }}
132-
${{ secrets.SSH_PRIVATE_KEY_CW_ORCH_INTERCHAIN }}
133128
- name: Setup sccache
134129
uses: mozilla-actions/sccache-action@v0.0.5
135130
with:
136131
version: "v0.8.1"
137-
- name: Install nightly
138-
uses: dtolnay/rust-toolchain@nightly
139-
- name: cargo install cargo-udeps
140-
uses: taiki-e/install-action@cargo-udeps
141-
- name: cargo install cargo-workspaces
142-
run: cargo +stable install cargo-workspaces
143-
- uses: Swatinem/rust-cache@v2
144-
with:
145-
workspaces: "framework -> target"
146-
- name: cargo udeps framework
132+
- name: Install stable
133+
uses: dtolnay/rust-toolchain@master
134+
with:
135+
toolchain: stable
136+
- name: Install cargo-machete
137+
working-directory: ./framework
138+
run: cargo install cargo-machete
139+
- name: Install cargo-machete
147140
working-directory: ./framework
148-
run: cargo workspaces exec cargo +nightly udeps --workspace --exclude "workspace-hack"
141+
run: cargo machete ./contracts/* ./packages/*

.github/workflows/framework-test.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ jobs:
2323
- uses: actions/checkout@v3
2424
with:
2525
submodules: true
26-
- uses: webfactory/ssh-agent@v0.8.0
27-
with:
28-
ssh-private-key: |
29-
${{ secrets.SSH_PRIVATE_KEY_MULTI_TEST }}
30-
${{ secrets.SSH_PRIVATE_KEY_CW_ORCH_INTERCHAIN }}
3126
- name: Setup sccache
3227
uses: mozilla-actions/sccache-action@v0.0.5
3328
with:

.github/workflows/modules-check.yml

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
strategy:
4040
fail-fast: false
4141
matrix:
42-
toolchain: [stable, beta]
42+
toolchain: [stable]
4343
steps:
4444
- uses: actions/checkout@v3
4545
with:
@@ -99,7 +99,7 @@ jobs:
9999
--mutually-exclusive-features \
100100
wynd,osmosis,astroport,bow,terraswap,astrovault,testing,osmosis-test,node-tests,interface,cw-orch,schema \
101101
--lib --tests
102-
102+
103103
# Find any unused dependencies
104104
unused-deps:
105105
runs-on: ubuntu-latest
@@ -108,21 +108,17 @@ jobs:
108108
- uses: actions/checkout@v3
109109
with:
110110
submodules: true
111-
- uses: webfactory/ssh-agent@v0.8.0
112-
with:
113-
ssh-private-key: |
114-
${{ secrets.SSH_PRIVATE_KEY_MULTI_TEST }}
115-
${{ secrets.SSH_PRIVATE_KEY_CW_ORCH_INTERCHAIN }}
116111
- name: Setup sccache
117112
uses: mozilla-actions/sccache-action@v0.0.5
118113
with:
119114
version: "v0.8.1"
120-
- name: Install nightly
121-
uses: dtolnay/rust-toolchain@nightly
122-
- name: cargo install cargo-udeps
123-
uses: taiki-e/install-action@cargo-udeps
124-
- name: cargo install cargo-workspaces
125-
run: cargo +stable install cargo-workspaces
126-
- name: cargo udeps modules
115+
- name: Install stable
116+
uses: dtolnay/rust-toolchain@master
117+
with:
118+
toolchain: stable
119+
- name: Install cargo-machete
120+
working-directory: ./modules
121+
run: cargo install cargo-machete
122+
- name: Install cargo-machete
127123
working-directory: ./modules
128-
run: cargo workspaces exec cargo +nightly udeps
124+
run: cargo machete

0 commit comments

Comments
 (0)