From 1e0727d6ba3bb695663334dd976cf685ac622d60 Mon Sep 17 00:00:00 2001 From: raulk Date: Thu, 17 Nov 2022 11:07:02 +0000 Subject: [PATCH] v8: generate bundles for the Wallaby testnet. (#851) * v8: add bundles for the Wallaby testnet. * v8: teach GitHub that wallaby exists. --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- Cargo.toml | 1 + Makefile | 5 ++++- build.rs | 2 ++ runtime/build.rs | 1 + 6 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b791772e0..274f193cd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: CACHE_SKIP_SAVE: ${{ matrix.push == '' || matrix.push == 'false' }} strategy: matrix: - network: [ 'mainnet', 'caterpillarnet', 'butterflynet', 'calibrationnet', 'devnet', 'testing', 'testing-fake-proofs' ] + network: [ 'mainnet', 'caterpillarnet', 'butterflynet', 'wallaby', 'calibrationnet', 'devnet', 'testing', 'testing-fake-proofs' ] steps: - name: Checking out uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fb112fa25..63b73759c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: CACHE_SKIP_SAVE: ${{ matrix.push == '' || matrix.push == 'false' }} strategy: matrix: - network: [ 'mainnet', 'caterpillarnet', 'butterflynet', 'calibrationnet', 'devnet', 'testing', 'testing-fake-proofs' ] + network: [ 'mainnet', 'caterpillarnet', 'butterflynet', 'wallaby', 'calibrationnet', 'devnet', 'testing', 'testing-fake-proofs' ] steps: - name: Checking out uses: actions/checkout@v2 diff --git a/Cargo.toml b/Cargo.toml index bb480ca08..383730268 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,6 +34,7 @@ default = [] ## translates to mainnet mainnet = [] caterpillarnet = [] butterflynet = [] +wallaby = [] calibrationnet = [] devnet = [] testing = [] diff --git a/Makefile b/Makefile index 82e9f1157..a5234afa1 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ bundle: deps-build cargo run -- -o output/builtin-actors.car # Create all canonical network bundles -all-bundles: bundle-mainnet bundle-caterpillarnet bundle-butterflynet bundle-calibrationnet bundle-devnet bundle-testing bundle-testing +all-bundles: bundle-mainnet bundle-caterpillarnet bundle-butterflynet bundle-wallaby bundle-calibrationnet bundle-devnet bundle-testing bundle-testing bundle-mainnet: deps-build BUILD_FIL_NETWORK=mainnet cargo run -- -o output/builtin-actors-mainnet.car @@ -63,6 +63,9 @@ bundle-mainnet: deps-build bundle-caterpillarnet: deps-build BUILD_FIL_NETWORK=caterpillarnet cargo run -- -o output/builtin-actors-caterpillarnet.car +bundle-wallaby: deps-build + BUILD_FIL_NETWORK=wallaby cargo run -- -o output/builtin-actors-wallaby.car + bundle-butterflynet: deps-build BUILD_FIL_NETWORK=butterflynet cargo run -- -o output/builtin-actors-butterflynet.car diff --git a/build.rs b/build.rs index 067f6a328..9d872806b 100644 --- a/build.rs +++ b/build.rs @@ -39,6 +39,8 @@ fn network_name() -> String { Some("caterpillarnet") } else if cfg!(feature = "butterflynet") { Some("butterflynet") + } else if cfg!(feature = "wallaby") { + Some("wallaby") } else if cfg!(feature = "calibrationnet") { Some("calibrationnet") } else if cfg!(feature = "devnet") { diff --git a/runtime/build.rs b/runtime/build.rs index 767b810bf..b1aaec3a8 100644 --- a/runtime/build.rs +++ b/runtime/build.rs @@ -12,6 +12,7 @@ static NETWORKS: &[(&str, &[&str])] = &[ ], ), ("butterflynet", &["sector-512m", "sector-32g", "sector-64g", "min-power-2g"]), + ("wallaby", &["sector-512m", "sector-32g", "sector-64g", "min-power-16g", "short-precommit"]), ("calibrationnet", &["sector-32g", "sector-64g", "min-power-32g"]), ("devnet", &["sector-2k", "sector-8m", "small-deals", "short-precommit", "min-power-2k"]), (