From 62f20bc170d8c1577cfef7b96f7b77a2cd277522 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Tue, 20 Oct 2020 12:13:27 -0700 Subject: [PATCH] Remove unsupported metrics tarball from release artifacts --- ci/publish-tarball.sh | 6 ++---- metrics/create-metrics-tarball.sh | 23 ----------------------- 2 files changed, 2 insertions(+), 27 deletions(-) delete mode 100755 metrics/create-metrics-tarball.sh diff --git a/ci/publish-tarball.sh b/ci/publish-tarball.sh index 9077139385021c..395938d876b4ae 100755 --- a/ci/publish-tarball.sh +++ b/ci/publish-tarball.sh @@ -91,17 +91,15 @@ echo --- Creating release tarball cp "${RELEASE_BASENAME}"/version.yml "${TARBALL_BASENAME}"-$TARGET.yml ) -# Metrics tarball is platform agnostic, only publish it from Linux +# Maybe tarballs are platform agnostic, only publish them from the Linux build MAYBE_TARBALLS= if [[ "$CI_OS_NAME" = linux ]]; then - metrics/create-metrics-tarball.sh ( set -x sdk/bpf/scripts/package.sh [[ -f bpf-sdk.tar.bz2 ]] - ) - MAYBE_TARBALLS="bpf-sdk.tar.bz2 solana-metrics.tar.bz2" + MAYBE_TARBALLS="bpf-sdk.tar.bz2" fi source ci/upload-ci-artifact.sh diff --git a/metrics/create-metrics-tarball.sh b/metrics/create-metrics-tarball.sh deleted file mode 100755 index f30e0e062cfc28..00000000000000 --- a/metrics/create-metrics-tarball.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash -set -e - -cd "$(dirname "$0")/.." - -echo --- Creating metrics tarball -( - set -x - rm -rf solana-metrics/ - mkdir solana-metrics/ - - COMMIT="$(git rev-parse HEAD)" - - ( - echo "commit: $COMMIT" - ) > solana-metrics/version.yml - - cp -a metrics/scripts/* solana-metrics - - tar jvcf solana-metrics.tar.bz2 solana-metrics/ -) - -ls -hl "$PWD"/solana-metrics.tar.bz2