Skip to content

Commit

Permalink
get rid of kbfs branch stuff (#15331)
Browse files Browse the repository at this point in the history
  • Loading branch information
mmaxim committed Jan 5, 2019
1 parent aa33ff8 commit 2a554d1
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions packaging/prerelease/build_app.sh
Expand Up @@ -10,7 +10,6 @@ nobuild=${NOBUILD:-} # Don't build go binaries
istest=${TEST:-} # If set to true, only build (for testing)
nopull=${NOPULL:-} # Don't git pull
client_commit=${CLIENT_COMMIT:-} # Commit on client to build from
kbfs_commit=${KBFS_COMMIT:-} # Commit on kbfs to build from
bucket_name=${BUCKET_NAME:-"prerelease.keybase.io"}
platform=${PLATFORM:-} # darwin,linux,windows (Only darwin is supported in this script)
nos3=${NOS3:-} # Don't sync to S3
Expand Down Expand Up @@ -52,7 +51,6 @@ kbfs_dir="$gopath/src/github.com/keybase/client/go/kbfs"
updater_dir="$gopath/src/github.com/keybase/go-updater"

if [ ! "$nopull" = "1" ]; then
"$client_dir/packaging/check_status_and_pull.sh" "$kbfs_dir"
"$client_dir/packaging/check_status_and_pull.sh" "$updater_dir"
fi

Expand All @@ -61,10 +59,8 @@ echo "Loading release tool"
release_bin="$GOPATH/bin/release"

client_branch=`cd "$client_dir" && git rev-parse --abbrev-ref HEAD`
kbfs_branch=`cd "$kbfs_dir" && git rev-parse --abbrev-ref HEAD`
function reset {
(cd "$client_dir" && git checkout $client_branch)
(cd "$kbfs_dir" && git checkout $kbfs_branch)
}
trap reset EXIT

Expand All @@ -77,15 +73,6 @@ if [ -n "$client_commit" ]; then
git pull || true
fi

if [ -n "$kbfs_commit" ]; then
cd "$kbfs_dir"
echo "Checking out $kbfs_commit on kbfs (will reset to $kbfs_branch)"
git checkout "$kbfs_commit"
# If commit is hash, this fails and is unnecessary, if branch it's needed to
# update if it has changed.
git pull || true
fi

# NB: This is duplicated in packaging/linux/build_and_push_packages.sh.
if [ ! "$nowait" = "1" ]; then
echo "Checking client CI"
Expand Down

0 comments on commit 2a554d1

Please sign in to comment.