Skip to content

Commit e4445bf

Browse files
aumetraaumetra
authored
Merge pull request #2149 from CosmWasm/remove-core
Rework `cosmwasm-core`
2 parents 3a6613f + 417f675 commit e4445bf

Some content is hidden

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

83 files changed

+963
-1380
lines changed

‎.circleci/config.yml

+59-63
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ workflows:
6363
# Keep those job names in sync with .mergify.yml
6464
jobs:
6565
- arm64
66+
- package_core
6667
- package_crypto
6768
- package_check
68-
- package_core
6969
- package_schema
7070
- package_schema_derive
7171
- package_std
@@ -238,38 +238,63 @@ jobs:
238238
- contracts/staking/target/wasm32-unknown-unknown/release/build
239239
- contracts/staking/target/wasm32-unknown-unknown/release/deps
240240

241-
package_crypto:
241+
package_core:
242242
docker:
243243
- image: rust:1.74
244+
environment:
245+
# Limit the number of parallel jobs to avoid OOM crashes during doc testing
246+
RUST_TEST_THREADS: 8
244247
steps:
245248
- checkout
246249
- run:
247250
name: Version information
248251
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
249252
- restore_cache:
250253
keys:
251-
- cargocache-v2-package_crypto-rust:1.74-{{ checksum "Cargo.lock" }}
254+
- cargocache-v2-package_core-rust:1.74-{{ checksum "Cargo.lock" }}
252255
- run:
253-
name: Build (no features)
254-
working_directory: ~/project/packages/crypto
256+
name: Add thumbv7em-none-eabi target
257+
command: rustup target add thumbv7em-none-eabi && rustup target list --installed
258+
- run:
259+
name: Add wasm32 target
260+
command: rustup target add wasm32-unknown-unknown && rustup target list --installed
261+
- run:
262+
name: Build library for native target (no features)
263+
working_directory: ~/project/packages/core
255264
command: cargo build --locked --no-default-features
256265
- run:
257-
name: Build (all features)
258-
working_directory: ~/project/packages/crypto
259-
command: cargo build --locked --features std
266+
name: Build library for wasm target (no features)
267+
working_directory: ~/project/packages/core
268+
command: cargo wasm --locked --no-default-features
260269
- run:
261-
name: Run tests
262-
working_directory: ~/project/packages/crypto
263-
command: cargo test --locked --features std
270+
name: Build library for no_std target (no features)
271+
working_directory: ~/project/packages/core
272+
command: cargo no-std --locked --no-default-features
273+
- run:
274+
name: Run unit tests (no features)
275+
working_directory: ~/project/packages/core
276+
command: cargo test --locked --no-default-features
277+
- run:
278+
name: Build library for native target (all features)
279+
working_directory: ~/project/packages/core
280+
command: cargo build --locked --all-features
281+
- run:
282+
name: Build library for wasm target (all features)
283+
working_directory: ~/project/packages/core
284+
command: cargo wasm --locked --all-features
285+
- run:
286+
name: Run unit tests (all features)
287+
working_directory: ~/project/packages/core
288+
command: cargo test --locked --all-features
264289
- save_cache:
265290
paths:
266291
- /usr/local/cargo/registry
267292
- target/debug/.fingerprint
268293
- target/debug/build
269294
- target/debug/deps
270-
key: cargocache-v2-package_crypto-rust:1.74-{{ checksum "Cargo.lock" }}
295+
key: cargocache-v2-package_core-rust:1.74-{{ checksum "Cargo.lock" }}
271296

272-
package_check:
297+
package_crypto:
273298
docker:
274299
- image: rust:1.74
275300
steps:
@@ -279,78 +304,49 @@ jobs:
279304
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
280305
- restore_cache:
281306
keys:
282-
- cargocache-v2-package_check-rust:1.74-{{ checksum "Cargo.lock" }}
307+
- cargocache-v2-package_crypto-rust:1.74-{{ checksum "Cargo.lock" }}
283308
- run:
284309
name: Build
285-
working_directory: ~/project/packages/check
310+
working_directory: ~/project/packages/crypto
286311
command: cargo build --locked
287312
- run:
288313
name: Run tests
289-
working_directory: ~/project/packages/check
314+
working_directory: ~/project/packages/crypto
290315
command: cargo test --locked
291316
- save_cache:
292317
paths:
293318
- /usr/local/cargo/registry
294319
- target/debug/.fingerprint
295320
- target/debug/build
296321
- target/debug/deps
297-
key: cargocache-v2-package_check-rust:1.74-{{ checksum "Cargo.lock" }}
322+
key: cargocache-v2-package_crypto-rust:1.74-{{ checksum "Cargo.lock" }}
298323

299-
package_core:
324+
package_check:
300325
docker:
301326
- image: rust:1.74
302-
environment:
303-
# Limit the number of parallel jobs to avoid OOM crashes during doc testing
304-
RUST_TEST_THREADS: 8
305327
steps:
306328
- checkout
307329
- run:
308330
name: Version information
309331
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
310332
- restore_cache:
311333
keys:
312-
- cargocache-v2-package_core-rust:1.74-{{ checksum "Cargo.lock" }}
313-
- run:
314-
name: Add thumbv7em-none-eabi target
315-
command: rustup target add thumbv7em-none-eabi && rustup target list --installed
316-
- run:
317-
name: Add wasm32 target
318-
command: rustup target add wasm32-unknown-unknown && rustup target list --installed
319-
- run:
320-
name: Build library for native target (no features)
321-
working_directory: ~/project/packages/core
322-
command: cargo build --locked --no-default-features
323-
- run:
324-
name: Build library for wasm target (no features)
325-
working_directory: ~/project/packages/core
326-
command: cargo wasm --locked --no-default-features
327-
- run:
328-
name: Build library for no_std target (no features)
329-
working_directory: ~/project/packages/core
330-
command: cargo no-std --locked --no-default-features
331-
- run:
332-
name: Run unit tests (no features)
333-
working_directory: ~/project/packages/core
334-
command: cargo test --locked --no-default-features
335-
- run:
336-
name: Build library for native target (all features)
337-
working_directory: ~/project/packages/core
338-
command: cargo build --locked --features std
334+
- cargocache-v2-package_check-rust:1.74-{{ checksum "Cargo.lock" }}
339335
- run:
340-
name: Build library for wasm target (all features)
341-
working_directory: ~/project/packages/core
342-
command: cargo wasm --locked --features std
336+
name: Build
337+
working_directory: ~/project/packages/check
338+
command: cargo build --locked
343339
- run:
344-
name: Run unit tests (all features)
345-
working_directory: ~/project/packages/core
346-
command: cargo test --locked --features std
340+
name: Run tests
341+
working_directory: ~/project/packages/check
342+
command: cargo test --locked
347343
- save_cache:
348344
paths:
349345
- /usr/local/cargo/registry
350346
- target/debug/.fingerprint
351347
- target/debug/build
352348
- target/debug/deps
353-
key: cargocache-v2-package_core-rust:1.74-{{ checksum "Cargo.lock" }}
349+
key: cargocache-v2-package_check-rust:1.74-{{ checksum "Cargo.lock" }}
354350

355351
package_schema:
356352
docker:
@@ -1006,6 +1002,14 @@ jobs:
10061002
#
10071003
# Workspace packages
10081004
#
1005+
- run:
1006+
name: Clippy linting on core (no feature flags)
1007+
working_directory: ~/project/packages/core
1008+
command: cargo clippy --all-targets -- -D warnings
1009+
- run:
1010+
name: Clippy linting on core (all feature flags)
1011+
working_directory: ~/project/packages/core
1012+
command: cargo clippy --all-features --all-targets -- -D warnings
10091013
- run:
10101014
name: Clippy linting on crypto
10111015
working_directory: ~/project/packages/crypto
@@ -1022,14 +1026,6 @@ jobs:
10221026
name: Clippy linting on schema-derive
10231027
working_directory: ~/project/packages/schema-derive
10241028
command: cargo clippy --all-targets --tests -- -D warnings
1025-
- run:
1026-
name: Clippy linting on core (no feature flags)
1027-
working_directory: ~/project/packages/core
1028-
command: cargo clippy --all-targets -- -D warnings
1029-
- run:
1030-
name: Clippy linting on core (all feature flags)
1031-
working_directory: ~/project/packages/core
1032-
command: cargo clippy --all-features --all-targets -- -D warnings
10331029
- run:
10341030
name: Clippy linting on std (no feature flags)
10351031
working_directory: ~/project/packages/std

‎.github/workflows/workspace.yml

+4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ jobs:
2121
toolchain: 1.74.0
2222
targets: wasm32-unknown-unknown
2323
components: clippy, rustfmt
24+
- name: "Cache build artifacts"
25+
uses: Swatinem/rust-cache@v2
2426
- name: Check workspace
2527
run: ./devtools/check_workspace.sh
2628

@@ -35,5 +37,7 @@ jobs:
3537
with:
3638
toolchain: 1.74.0
3739
components: rustfmt
40+
- name: "Cache build artifacts"
41+
uses: Swatinem/rust-cache@v2
3842
- name: Test workspace
3943
run: ./devtools/test_workspace.sh

‎Cargo.lock

+4-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎contracts/burner/Cargo.lock

+4-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎contracts/crypto-verify/Cargo.lock

+4-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)