diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index 243977f81bd..2470493eac0 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -77,7 +77,6 @@ jobs: persist-credentials: false - uses: actionsdesk/lfs-warning@v3.2 with: - token: ${{ secrets.GITHUB_TOKEN }} filesizelimit: 10KB exclusionPatterns: | **/*.rs @@ -559,7 +558,6 @@ jobs: - name: Deploy docs uses: FirebaseExtended/action-hosting-deploy@0f248036885ae672f78587669fa2923f0ef6cac2 with: - repoToken: ${{ secrets.GITHUB_TOKEN }} firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_DOCS_COMPOSABLE_FINANCE }} projectId: composable-docs entrypoint: docs/ diff --git a/docs/docs/nix/install.md b/docs/docs/nix/install.md index 5105f456a81..607f13e0337 100644 --- a/docs/docs/nix/install.md +++ b/docs/docs/nix/install.md @@ -12,7 +12,7 @@ package manager that allows you to build and run Nix packages using the Nix build system. _This is in most cases as compatible as #1_. Once you have determined which one you want to use, [follow the official Nix -installation instructions](https://nixos.org/download.html). +installation instructions](https://zero-to-nix.com/start/install). ### Best-effort, zero-support options diff --git a/flake/zombienet.nix b/flake/zombienet.nix index 103dfada643..17625d972be 100644 --- a/flake/zombienet.nix +++ b/flake/zombienet.nix @@ -9,7 +9,7 @@ count = 3; }; - zombienet-rococo-local-composable-config = with prelude; + overrideZombienet = with prelude; { chain, ws_port ? null, rpc_port ? null, relay_ws_port ? null , relay_rpc_port ? null, rust_log_add ? null, para-id ? 2087 , command ? self'.packages.composable-node, relaychain ? relaychainBase @@ -75,7 +75,7 @@ chain-spec = "picasso-dev"; }; - picasso-dev-config = zombienet-rococo-local-composable-config { + picasso-dev-config = overrideZombienet { chain = "picasso-dev"; command = self'.packages.composable-testfast-node; }; @@ -92,11 +92,10 @@ devnet-composable = zombienet-westend-local-composable-dev; livenet-composable = zombieTools.writeZombienetShellApplication - "zombienet-polkadot-local-composable-dev" - (zombienet-rococo-local-composable-config { + "zombienet-polkadot-local-composable-dev" (overrideZombienet { chain = "composable-dev"; relaychain = { - chain = "polkadot-local"; + chain = "polkadot-dev"; default_command = pkgs.lib.meta.getExe self'.packages.polkadot-live-runtime-node; count = 3; @@ -110,8 +109,7 @@ zombienet-westend-local-composable-dev = zombieTools.writeZombienetShellApplication - "zombienet-westend-local-composable-dev" - (zombienet-rococo-local-composable-config { + "zombienet-westend-local-composable-dev" (overrideZombienet { chain = "composable-dev"; relaychain = { chain = "westend-local"; @@ -123,8 +121,7 @@ zombienet-picasso-centauri-a = zombieTools.writeZombienetShellApplication - "zombienet-picasso-centauri-a" - (zombienet-rococo-local-composable-config { + "zombienet-picasso-centauri-a" (overrideZombienet { rust_log_add = "runtime::contracts=debug,ibc_transfer=trace,pallet_ibc=trace,grandpa-verifier=trace"; command = self'.packages.composable-testfast-node; @@ -133,8 +130,7 @@ zombienet-picasso-centauri-b = zombieTools.writeZombienetShellApplication - "zombienet-picasso-centauri-b" - (zombienet-rococo-local-composable-config { + "zombienet-picasso-centauri-b" (overrideZombienet { ws_port = 29988; rpc_port = 32201; relay_ws_port = 29944; @@ -147,8 +143,7 @@ zombienet-composable-centauri-b = zombieTools.writeZombienetShellApplication - "zombienet-composable-centauri-b" - (zombienet-rococo-local-composable-config { + "zombienet-composable-centauri-b" (overrideZombienet { ws_port = 29988; rpc_port = 32201; relay_ws_port = 29944; diff --git a/inputs/paritytech/zombienet/default.nix b/inputs/paritytech/zombienet/default.nix index 2338e1f9fe7..24ebe1e870f 100644 --- a/inputs/paritytech/zombienet/default.nix +++ b/inputs/paritytech/zombienet/default.nix @@ -132,6 +132,7 @@ in with prelude; rec { post_state = "Hash"; }; }; + mkZombienet = { relaychain, parachains }: { hrmp_channels = mkHrmpChannels parachains; relaychain = mkRelaychain relaychain;