Skip to content

Commit

Permalink
try to fix cargo-dist
Browse files Browse the repository at this point in the history
  • Loading branch information
seunlanlege committed May 10, 2024
1 parent 6166617 commit 0dbd3cf
Show file tree
Hide file tree
Showing 15 changed files with 27 additions and 16 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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.
Expand Down Expand Up @@ -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 }}
Expand Down
6 changes: 4 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion modules/ismp/clients/parachain/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.6.2"
edition = "2021"
authors = ["Polytope Labs <[email protected]>"]
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"
Expand Down
2 changes: 1 addition & 1 deletion modules/ismp/clients/parachain/inherent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.6.2"
edition = "2021"
authors = ["Polytope Labs <[email protected]>"]
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"
Expand Down
2 changes: 1 addition & 1 deletion modules/ismp/clients/parachain/runtime-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.6.2"
edition = "2021"
authors = ["Polytope Labs <[email protected]>"]
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"
Expand Down
2 changes: 1 addition & 1 deletion modules/ismp/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2021"
description = "Rust implementation of the interoperable state machine protocol"
authors = ["Polytope Labs <[email protected]>"]
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"]
Expand Down
2 changes: 1 addition & 1 deletion modules/ismp/pallets/hyperbridge/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.6.2"
edition = "2021"
authors = ["Polytope Labs <[email protected]>"]
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."
Expand Down
2 changes: 1 addition & 1 deletion modules/ismp/pallets/pallet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.6.2"
edition = "2021"
authors = ["Polytope Labs <[email protected]>"]
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"
Expand Down
2 changes: 1 addition & 1 deletion modules/ismp/pallets/rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.6.2"
edition = "2021"
authors = ["Polytope Labs <[email protected]>"]
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"
Expand Down
2 changes: 1 addition & 1 deletion modules/ismp/pallets/runtime-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.6.2"
edition = "2021"
authors = ["Polytope Labs <[email protected]>"]
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"
Expand Down
2 changes: 1 addition & 1 deletion modules/ismp/state-machines/substrate/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.6.2"
edition = "2021"
authors = ["Polytope Labs <[email protected]>"]
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 "
Expand Down
2 changes: 1 addition & 1 deletion modules/trees/mmr/primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.6.2"
edition = "2021"
authors = ["Polytope Labs <[email protected]>"]
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"
Expand Down
2 changes: 2 additions & 0 deletions parachain/node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ edition = "2021"
build = "build.rs"
publish = false

[package.metadata.dist]
dist = true

[dependencies]
# crates.io
Expand Down
3 changes: 2 additions & 1 deletion scripts/release-crates.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions tesseract/relayer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ description = "Chain agnostic relayer implementation for Hyperbridge"
authors = ["Polytope Labs <[email protected]>"]
publish = false

[package.metadata.dist]
dist = true

[dependencies]
tesseract-substrate = { workspace = true }
tesseract-primitives = { workspace = true }
Expand Down

0 comments on commit 0dbd3cf

Please sign in to comment.