瀏覽代碼

Remove certain built binaries from published tarball (#7324)

* remove deprecated bins

* update ci scripts;
- add flag to cargo-install-all to make the agave-validator build conditional
- use the new flag in publish-tarball to disable publishing of agave-validator bin

* initialize DCOU_BINS array in public builds
Mircea Colonescu 3 月之前
父節點
當前提交
c0ac9198fb
共有 2 個文件被更改,包括 21 次插入15 次删除
  1. 1 1
      ci/publish-tarball.sh
  2. 20 14
      scripts/cargo-install-all.sh

+ 1 - 1
ci/publish-tarball.sh

@@ -89,7 +89,7 @@ echo --- Creating release tarball
   export CHANNEL
 
   source ci/rust-version.sh stable
-  scripts/cargo-install-all.sh stable "${RELEASE_BASENAME}"
+  scripts/cargo-install-all.sh --public-release stable "${RELEASE_BASENAME}"
 
   tar cvf "${TARBALL_BASENAME}"-$TARGET.tar "${RELEASE_BASENAME}"
   bzip2 "${TARBALL_BASENAME}"-$TARGET.tar

+ 20 - 14
scripts/cargo-install-all.sh

@@ -42,6 +42,7 @@ installDir=
 buildProfileArg='--profile release'
 buildProfile='release'
 validatorOnly=
+publicRelease=
 
 while [[ -n $1 ]]; do
   if [[ ${1:0:1} = - ]]; then
@@ -60,6 +61,9 @@ while [[ -n $1 ]]; do
     elif [[ $1 = --validator-only ]]; then
       validatorOnly=true
       shift
+    elif [[ $1 = --public-release ]]; then
+      publicRelease=true
+      shift
     else
       usage "Unknown option: $1"
     fi
@@ -96,7 +100,6 @@ if [[ $CI_OS_NAME = windows ]]; then
     agave-install
     agave-install-init
     solana-keygen
-    solana-stake-accounts
     solana-test-validator
     solana-tokens
   )
@@ -104,22 +107,28 @@ if [[ $CI_OS_NAME = windows ]]; then
 else
   ./fetch-perf-libs.sh
 
+  DCOU_BINS=()
   BINS=(
     solana
     solana-faucet
     solana-genesis
-    solana-gossip
     agave-install
     solana-keygen
-    solana-net-shaper
-    agave-validator
-    rbpf-cli
-  )
-  DCOU_BINS=(
-    agave-ledger-tool
-    solana-bench-tps
   )
 
+  if [[ -z "$publicRelease" ]]; then
+    BINS+=(
+      agave-validator
+      agave-watchtower
+      solana-gossip
+    )
+
+    DCOU_BINS+=(
+      agave-ledger-tool
+    )
+  fi
+
+
   # Speed up net.sh deploys by excluding unused binaries
   if [[ -z "$validatorOnly" ]]; then
     BINS+=(
@@ -128,15 +137,12 @@ else
       agave-install-init
       solana-stake-accounts
       solana-test-validator
-      solana-tokens
-      agave-watchtower
-    )
-    DCOU_BINS+=(
-      solana-dos
     )
   fi
 fi
 
+echo "Building binaries for: ${BINS[*]}"
+
 binArgs=()
 for bin in "${BINS[@]}"; do
   binArgs+=(--bin "$bin")