Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build-publish-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ jobs:
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: build
run: |
forklift cargo nextest --manifest-path polkadot/zombienet-sdk-tests/Cargo.toml archive --locked --features zombie-metadata,zombie-ci --archive-file polkadot-zombienet-tests.tar.zst
forklift cargo nextest --manifest-path polkadot/zombienet-sdk-tests/Cargo.toml archive --locked --cargo-profile testnet --features zombie-metadata,zombie-ci --archive-file polkadot-zombienet-tests.tar.zst
- name: pack artifacts
run: |
mkdir -p artifacts
Expand Down Expand Up @@ -422,7 +422,7 @@ jobs:
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: build
run: |
forklift cargo nextest --manifest-path substrate/zombienet/zombienet-sdk/Cargo.toml archive --locked --features zombie-ci --archive-file substrate-zombienet-tests.tar.zst
forklift cargo nextest --manifest-path substrate/zombienet/zombienet-sdk/Cargo.toml archive --locked --cargo-profile testnet --features zombie-ci --archive-file substrate-zombienet-tests.tar.zst
- name: pack artifacts
run: |
mkdir -p artifacts
Expand Down Expand Up @@ -452,7 +452,7 @@ jobs:
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: build
run: |
forklift cargo nextest --manifest-path cumulus/zombienet/zombienet-sdk/Cargo.toml archive --locked --features zombie-ci --archive-file cumulus-zombienet-tests.tar.zst
forklift cargo nextest --manifest-path cumulus/zombienet/zombienet-sdk/Cargo.toml archive --locked --cargo-profile testnet --features zombie-ci --archive-file cumulus-zombienet-tests.tar.zst
- name: pack artifacts
run: |
mkdir -p artifacts
Expand All @@ -479,7 +479,7 @@ jobs:
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: build
run: |
forklift cargo nextest --manifest-path templates/zombienet/Cargo.toml archive --locked --features zombienet --archive-file parachain-templates-zombienet-tests.tar.zst
forklift cargo nextest --manifest-path templates/zombienet/Cargo.toml archive --locked --cargo-profile testnet --features zombienet --archive-file parachain-templates-zombienet-tests.tar.zst
- name: pack artifacts
run: |
mkdir -p artifacts
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ jobs:
# name: hfuzz-${{ github.sha }}

cargo-check-each-crate:
timeout-minutes: 70
timeout-minutes: 120
needs: [preflight]
runs-on: ${{ needs.preflight.outputs.RUNNER }}
if: ${{ needs.preflight.outputs.changes_rust }}
Expand Down
19 changes: 13 additions & 6 deletions substrate/utils/wasm-builder/src/wasm_project.rs
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ fn maybe_compact_and_compress_wasm(
build_config: &BuildConfiguration,
bloaty_changed: bool,
) -> (Option<WasmBinary>, WasmBinaryBloaty, bool) {
let needs_compact = build_config.blob_build_profile.wants_compact();
let needs_compact = build_config.outer_build_profile.wants_compact();
let compact_path = blob_paths.compact();
let compressed_path = blob_paths.compact_compressed();
let compact_or_compressed_exists = compact_path.exists() || compressed_path.exists();
Expand Down Expand Up @@ -810,7 +810,9 @@ impl Profile {
/// The build configuration for this build.
#[derive(Debug)]
struct BuildConfiguration {
/// The profile to use to build the runtime blob and decide whether to compact/compress.
/// The profile that is used to build the outer project.
pub outer_build_profile: Profile,
/// The profile to use to build the runtime blob.
pub blob_build_profile: Profile,
}

Expand All @@ -826,7 +828,9 @@ impl BuildConfiguration {
/// When not overridden by a env variable we always default to building wasm with the `Release`
/// profile even when the main build uses the debug build. This is because wasm built with the
/// `Debug` profile is too slow for normal development activities and almost never intended.
/// Compaction and compression are also decided by this profile.
///
/// When cargo is building in `--profile dev`, user likely intends to compile fast, so we don't
/// bother producing compact or compressed blobs.
///
/// # Note
///
Expand Down Expand Up @@ -856,8 +860,8 @@ impl BuildConfiguration {
.to_string();
(name, false)
};
let detected_profile = Profile::iter().find(|p| p.directory() == name);
let blob_build_profile = match (detected_profile, overridden) {
let outer_build_profile = Profile::iter().find(|p| p.directory() == name);
let blob_build_profile = match (outer_build_profile.clone(), overridden) {
// When not overridden by a env variable we default to using the `Release` profile
// for the wasm build even when the main build uses the debug build. This
// is because the `Debug` profile is too slow for normal development activities.
Expand Down Expand Up @@ -885,7 +889,10 @@ impl BuildConfiguration {
process::exit(1);
},
};
BuildConfiguration { blob_build_profile }
BuildConfiguration {
outer_build_profile: outer_build_profile.unwrap_or(Profile::Release),
blob_build_profile,
}
}
}

Expand Down
Loading