diff --git a/Cargo.toml b/Cargo.toml index 95000cde59..6cff888966 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,36 +1,3 @@ -[package] -name = "solana-workspace" -description = "Blockchain, Rebuilt for Scale" -version = "0.13.0" -documentation = "https://docs.rs/solana" -homepage = "https://solana.com/" -readme = "README.md" -repository = "https://github.com/solana-labs/solana" -authors = ["Solana Maintainers "] -license = "Apache-2.0" -edition = "2018" - -[badges] -codecov = { repository = "solana-labs/solana", branch = "master", service = "github" } - -[features] -chacha = ["solana/chacha"] -cuda = ["solana/cuda"] -erasure = ["solana/erasure"] - -[dev-dependencies] -bincode = "1.1.2" -log = "0.4.2" -solana = { path = "core", version = "0.13.0" } -solana-budget-program = { path = "programs/budget", version = "0.13.0" } -solana-client = { path = "client", version = "0.13.0" } -solana-logger = { path = "logger", version = "0.13.0" } -solana-netutil = { path = "netutil", version = "0.13.0" } -solana-runtime = { path = "runtime", version = "0.13.0" } -solana-sdk = { path = "sdk", version = "0.13.0" } -solana-vote-api = { path = "programs/vote_api", version = "0.13.0" } - - [workspace] members = [ ".", diff --git a/ci/crate-version.sh b/ci/crate-version.sh index a33e6faa33..9038355e98 100755 --- a/ci/crate-version.sh +++ b/ci/crate-version.sh @@ -1,17 +1,26 @@ #!/usr/bin/env bash # -# Outputs the current crate version +# Outputs the current crate version from a given Cargo.toml # set -e -cd "$(dirname "$0")"/.. +Cargo_toml=$1 +[[ -n $Cargo_toml ]] || { + echo "Usage: $0 path/to/Cargo.toml" + exit 0 +} + +[[ -r $Cargo_toml ]] || { + echo "Error: unable to read $Cargo_toml" + exit 1 +} while read -r name equals value _; do if [[ $name = version && $equals = = ]]; then echo "${value//\"/}" exit 0 fi -done < <(cat Cargo.toml) +done < <(cat "$Cargo_toml") echo Unable to locate version in Cargo.toml 1>&2 exit 1 diff --git a/scripts/increment-cargo-version.sh b/scripts/increment-cargo-version.sh index fe6365d3b5..ea9a6c8465 100755 --- a/scripts/increment-cargo-version.sh +++ b/scripts/increment-cargo-version.sh @@ -42,7 +42,7 @@ MAJOR=0 MINOR=0 PATCH=0 SPECIAL="" -semverParseInto "$(readCargoVariable version ./Cargo.toml)" MAJOR MINOR PATCH SPECIAL +semverParseInto "$(readCargoVariable version "${Cargo_tomls[0]}")" MAJOR MINOR PATCH SPECIAL [[ -n $MAJOR ]] || usage currentVersion="$MAJOR.$MINOR.$PATCH$SPECIAL" diff --git a/sdk/bpf/scripts/package.sh b/sdk/bpf/scripts/package.sh index 2f1fffde85..0acaa1bfac 100755 --- a/sdk/bpf/scripts/package.sh +++ b/sdk/bpf/scripts/package.sh @@ -8,7 +8,7 @@ mkdir bpf-sdk/ cp LICENSE bpf-sdk/ ( - ci/crate-version.sh + ci/crate-version.sh sdk/Cargo.toml git rev-parse HEAD ) > bpf-sdk/version.txt