From 0dbd3cf23344994cce84f157b7e0c22b7544ee5c Mon Sep 17 00:00:00 2001 From: Seun Lanlege Date: Fri, 10 May 2024 17:00:24 +0000 Subject: [PATCH] try to fix cargo-dist --- .github/workflows/release.yml | 9 ++++++--- Cargo.toml | 6 ++++-- modules/ismp/clients/parachain/client/Cargo.toml | 2 +- modules/ismp/clients/parachain/inherent/Cargo.toml | 2 +- modules/ismp/clients/parachain/runtime-api/Cargo.toml | 2 +- modules/ismp/core/Cargo.toml | 2 +- modules/ismp/pallets/hyperbridge/Cargo.toml | 2 +- modules/ismp/pallets/pallet/Cargo.toml | 2 +- modules/ismp/pallets/rpc/Cargo.toml | 2 +- modules/ismp/pallets/runtime-api/Cargo.toml | 2 +- modules/ismp/state-machines/substrate/Cargo.toml | 2 +- modules/trees/mmr/primitives/Cargo.toml | 2 +- parachain/node/Cargo.toml | 2 ++ scripts/release-crates.sh | 3 ++- tesseract/relayer/Cargo.toml | 3 +++ 15 files changed, 27 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 14383180f..1d5b451fb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,12 +40,15 @@ permissions: on: push: tags: - - '**[0-9]+.[0-9]+.[0-9]+*' + - "**[0-9]+.[0-9]+.[0-9]+*" concurrency: group: cargo-dist-release-${{ github.ref }} cancel-in-progress: true +env: + TELEMETRY_SECRET_KEY: ${{ secrets.TELEMETRY_SECRET_KEY }} + jobs: # Run 'cargo dist plan' (or host) to determine what tasks we need to do plan: @@ -65,7 +68,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.8.0/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.14.1/cargo-dist-installer.sh | sh" # sure would be cool if github gave us proper conditionals... # so here's a doubly-nested ternary-via-truthiness to try to provide the best possible # functionality based on whether this is a pull_request, and whether it's from a fork. @@ -103,7 +106,7 @@ jobs: # - 1 "global" task that builds universal installers # - N "local" tasks that build each platform's binaries and platform-specific installers matrix: ${{ fromJson(needs.plan.outputs.val).ci.github.artifacts_matrix }} -# runs-on: ${{ matrix.runner }} + # runs-on: ${{ matrix.runner }} runs-on: arc-runner-set env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/Cargo.toml b/Cargo.toml index 8f72b6f30..acb9e5b8f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -77,9 +77,9 @@ members = [ # Config for 'cargo dist' [workspace.metadata.dist] # The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax) -cargo-dist-version = "0.8.0" +cargo-dist-version = "0.14.1" # CI backends to support -ci = ["github"] +ci = "github" # The installers to generate for each app installers = ["shell"] # A GitHub repo to push Homebrew formulas to @@ -92,6 +92,8 @@ unix-archive = ".tar.gz" pr-run-mode = "upload" # Skip checking whether the specified configuration files are up to date allow-dirty = ["ci"] +# Whether to install an updater program +install-updater = true # The profile that 'cargo dist' will build with [profile.dist] diff --git a/modules/ismp/clients/parachain/client/Cargo.toml b/modules/ismp/clients/parachain/client/Cargo.toml index 9aae653f8..7c3661fea 100644 --- a/modules/ismp/clients/parachain/client/Cargo.toml +++ b/modules/ismp/clients/parachain/client/Cargo.toml @@ -4,7 +4,7 @@ version = "1.6.2" edition = "2021" authors = ["Polytope Labs "] license = "Apache-2.0" -repository = "https://github.com/polytope-labs/hyperbridge/tree/main/modules/ismp/clients/parachain/client" +repository = "https://github.com/polytope-labs/hyperbridge" homepage = "https://docs.hyperbridge.network/integrations/polkadot-sdk" documentation = "https://docs.rs/ismp-parachain" description = "Parachain consensus client for pallet-ismp" diff --git a/modules/ismp/clients/parachain/inherent/Cargo.toml b/modules/ismp/clients/parachain/inherent/Cargo.toml index ac267e451..ea2578b63 100644 --- a/modules/ismp/clients/parachain/inherent/Cargo.toml +++ b/modules/ismp/clients/parachain/inherent/Cargo.toml @@ -4,7 +4,7 @@ version = "1.6.2" edition = "2021" authors = ["Polytope Labs "] license = "Apache-2.0" -repository = "https://github.com/polytope-labs/hyperbridge/tree/main/modules/ismp/clients/parachain/inherent" +repository = "https://github.com/polytope-labs/hyperbridge" homepage = "https://docs.hyperbridge.network/integrations/polkadot-sdk" documentation = "https://docs.rs/ismp-parachain-inherent" description = "Parachain ISMPconsensus client inherent provider" diff --git a/modules/ismp/clients/parachain/runtime-api/Cargo.toml b/modules/ismp/clients/parachain/runtime-api/Cargo.toml index 1982bab22..ade7f1898 100644 --- a/modules/ismp/clients/parachain/runtime-api/Cargo.toml +++ b/modules/ismp/clients/parachain/runtime-api/Cargo.toml @@ -4,7 +4,7 @@ version = "1.6.2" edition = "2021" authors = ["Polytope Labs "] license = "Apache-2.0" -repository = "https://github.com/polytope-labs/hyperbridge/tree/main/modules/ismp/clients/parachain/runtime-api" +repository = "https://github.com/polytope-labs/hyperbridge" homepage = "https://docs.hyperbridge.network/integrations/polkadot-sdk" documentation = "https://docs.rs/ismp-parachain" description = "Substrate runtime API for the ISMP Parachain consensus client" diff --git a/modules/ismp/core/Cargo.toml b/modules/ismp/core/Cargo.toml index b082cc91c..1953e38e5 100644 --- a/modules/ismp/core/Cargo.toml +++ b/modules/ismp/core/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" description = "Rust implementation of the interoperable state machine protocol" authors = ["Polytope Labs "] license = "Apache-2.0" -repository = "https://github.com/polytope-labs/hyperbridge/tree/main/modules/ismp/core" +repository = "https://github.com/polytope-labs/hyperbridge" homepage = "https://docs.hyperbridge.network/protocol/ismp" documentation = "https://docs.rs/ismp" keywords = ["substrate", "polkadot-sdk", "ISMP", "interoperability"] diff --git a/modules/ismp/pallets/hyperbridge/Cargo.toml b/modules/ismp/pallets/hyperbridge/Cargo.toml index adf374cb1..e746d2caf 100644 --- a/modules/ismp/pallets/hyperbridge/Cargo.toml +++ b/modules/ismp/pallets/hyperbridge/Cargo.toml @@ -4,7 +4,7 @@ version = "1.6.2" edition = "2021" authors = ["Polytope Labs "] license = "Apache-2.0" -repository = "https://github.com/polytope-labs/hyperbridge/tree/main/modules/ismp/pallets/hyperbridge" +repository = "https://github.com/polytope-labs/hyperbridge" homepage = "https://docs.hyperbridge.network/integrations/polkadot-sdk" documentation = "https://docs.rs/pallet-hyperbridge" description = "Pallet hyperbridge mediates the connection between hyperbridge and substrate-based chains." diff --git a/modules/ismp/pallets/pallet/Cargo.toml b/modules/ismp/pallets/pallet/Cargo.toml index 657d53628..e9d32ab18 100644 --- a/modules/ismp/pallets/pallet/Cargo.toml +++ b/modules/ismp/pallets/pallet/Cargo.toml @@ -4,7 +4,7 @@ version = "1.6.2" edition = "2021" authors = ["Polytope Labs "] license = "Apache-2.0" -repository = "https://github.com/polytope-labs/hyperbridge/tree/main/modules/ismp/pallets/pallet" +repository = "https://github.com/polytope-labs/hyperbridge" homepage = "https://docs.hyperbridge.network/integrations/polkadot-sdk" documentation = "https://docs.rs/pallet-ismp" description = "The substrate runtime implementation of the Interoperable State Machine Protocol" diff --git a/modules/ismp/pallets/rpc/Cargo.toml b/modules/ismp/pallets/rpc/Cargo.toml index 407801cb7..9dd9a9e86 100644 --- a/modules/ismp/pallets/rpc/Cargo.toml +++ b/modules/ismp/pallets/rpc/Cargo.toml @@ -4,7 +4,7 @@ version = "1.6.2" edition = "2021" authors = ["Polytope Labs "] license = "Apache-2.0" -repository = "https://github.com/polytope-labs/hyperbridge/tree/main/modules/ismp/pallets/rpc" +repository = "https://github.com/polytope-labs/hyperbridge" homepage = "https://docs.hyperbridge.network/integrations/polkadot-sdk" documentation = "https://docs.rs/pallet-ismp-rpc" description = "RPC apis for pallet-ismp" diff --git a/modules/ismp/pallets/runtime-api/Cargo.toml b/modules/ismp/pallets/runtime-api/Cargo.toml index 064697bdb..c8d0daea2 100644 --- a/modules/ismp/pallets/runtime-api/Cargo.toml +++ b/modules/ismp/pallets/runtime-api/Cargo.toml @@ -4,7 +4,7 @@ version = "1.6.2" edition = "2021" authors = ["Polytope Labs "] license = "Apache-2.0" -repository = "https://github.com/polytope-labs/hyperbridge/tree/main/modules/ismp/pallets/runtime-api" +repository = "https://github.com/polytope-labs/hyperbridge" homepage = "https://docs.hyperbridge.network/integrations/polkadot-sdk" documentation = "https://docs.rs/pallet-ismp" description = "The substrate runtime API for pallet-ismp" diff --git a/modules/ismp/state-machines/substrate/Cargo.toml b/modules/ismp/state-machines/substrate/Cargo.toml index 8d1389182..ea630476b 100644 --- a/modules/ismp/state-machines/substrate/Cargo.toml +++ b/modules/ismp/state-machines/substrate/Cargo.toml @@ -4,7 +4,7 @@ version = "1.6.2" edition = "2021" authors = ["Polytope Labs "] license = "Apache-2.0" -repository = "https://github.com/polytope-labs/hyperbridge/tree/main/modules/ismp/state-machines/substrate" +repository = "https://github.com/polytope-labs/hyperbridge" homepage = "https://docs.hyperbridge.network/integrations/polkadot-sdk" documentation = "https://docs.rs/substrate-state-machine" description = "ISMP state machine client implementation for substrate-based chains " diff --git a/modules/trees/mmr/primitives/Cargo.toml b/modules/trees/mmr/primitives/Cargo.toml index c169fca89..cc369510e 100644 --- a/modules/trees/mmr/primitives/Cargo.toml +++ b/modules/trees/mmr/primitives/Cargo.toml @@ -4,7 +4,7 @@ version = "1.6.2" edition = "2021" authors = ["Polytope Labs "] license = "Apache-2.0" -repository = "https://github.com/polytope-labs/hyperbridge/tree/main/modules/trees/mmr/primitives" +repository = "https://github.com/polytope-labs/hyperbridge" homepage = "https://docs.hyperbridge.network/integrations/polkadot-sdk" documentation = "https://docs.rs/ismp-parachain" description = "Merkle mountain range primitives for pallet-ismp" diff --git a/parachain/node/Cargo.toml b/parachain/node/Cargo.toml index 415ca2817..4c38cc45d 100644 --- a/parachain/node/Cargo.toml +++ b/parachain/node/Cargo.toml @@ -8,6 +8,8 @@ edition = "2021" build = "build.rs" publish = false +[package.metadata.dist] +dist = true [dependencies] # crates.io diff --git a/scripts/release-crates.sh b/scripts/release-crates.sh index 56ee25196..c4e981fec 100755 --- a/scripts/release-crates.sh +++ b/scripts/release-crates.sh @@ -10,4 +10,5 @@ cargo release \ -p substrate-state-machine \ -p ismp-parachain \ -p ismp-parachain-runtime-api \ --p ismp-parachain-inherent --execute +-p ismp-parachain-inherent \ +--execute diff --git a/tesseract/relayer/Cargo.toml b/tesseract/relayer/Cargo.toml index e72297c08..f43bcf0ae 100644 --- a/tesseract/relayer/Cargo.toml +++ b/tesseract/relayer/Cargo.toml @@ -6,6 +6,9 @@ description = "Chain agnostic relayer implementation for Hyperbridge" authors = ["Polytope Labs "] publish = false +[package.metadata.dist] +dist = true + [dependencies] tesseract-substrate = { workspace = true } tesseract-primitives = { workspace = true }