Skip to content

Commit

Permalink
fix pipeline failure for release test
Browse files Browse the repository at this point in the history
Signed-off-by: Benjamin Wang <[email protected]>
  • Loading branch information
ahrtr committed Jul 12, 2022
1 parent d3dfc9b commit 5cda87d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
10 changes: 6 additions & 4 deletions scripts/build-binary.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@

set -e

source ./scripts/test_lib.sh

VER=$1
PROJ="etcd"
REPOSITORY="${REPOSITORY:-https://github.com/etcd-io/etcd.git}"

if [ -z "$1" ]; then
echo "Usage: ${0} VERSION" >> /dev/stderr
Expand All @@ -17,13 +20,12 @@ function setup_env {
local ver=${2}

if [ ! -d "${proj}" ]; then
git clone https://github.com/etcd-io/"${proj}"
log_callout "Cloning ${REPOSITORY}..."
git clone "${REPOSITORY}"
fi

pushd "${proj}" >/dev/null
git checkout main
git fetch --all
git reset --hard origin/main
git checkout "${ver}"
popd >/dev/null
}
Expand Down Expand Up @@ -53,7 +55,7 @@ function package {
}

function main {
mkdir release
mkdir -p release
cd release
setup_env "${PROJ}" "${VER}"

Expand Down
5 changes: 3 additions & 2 deletions scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,9 @@ main() {
if [[ -n $(git status -s) ]]; then
log_callout "Committing version/version.go update."
git add version/version.go
git diff --staged | cat
git commit --signoff -m "version: bump up to ${VERSION}"
git diff --staged
git diff --staged | cat
fi

# Push the version change if it's not already been pushed.
Expand Down Expand Up @@ -163,7 +164,7 @@ main() {
log_callout "Building release..."
# Check for old and new names of the release build script.
# TODO: Move the release script into this on as a function?
./scripts/build-release.sh "${RELEASE_VERSION}"
REPOSITORY=$(pwd) ./scripts/build-release.sh "${RELEASE_VERSION}"
fi

# Sanity checks.
Expand Down

0 comments on commit 5cda87d

Please sign in to comment.