Skip to content

Commit

Permalink
Merge pull request #6494 from habitat-sh/jb/fix-more-breakage
Browse files Browse the repository at this point in the history
Add license acceptance in one more spot
  • Loading branch information
raskchanky authored Apr 30, 2019
2 parents 7d1fb94 + 311e8e3 commit 945127a
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions .buildkite/scripts/bintray_upload.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
set -euo pipefail

source .buildkite/scripts/shared.sh
export HAB_LICENSE="accept-no-persist"

set_hab_binary

Expand All @@ -23,7 +24,7 @@ channel=$(get_release_channel)
# use it here

echo "--- :habicat: Installing core/hab-bintray-publish from '${channel}' channel"
sudo "${hab_binary:?}" pkg install \
sudo HAB_LICENSE="accept-no-persist" "${hab_binary:?}" pkg install \
--channel="${channel}" \
core/hab-bintray-publish

Expand All @@ -45,15 +46,16 @@ if [ "$BUILD_PKG_TARGET" = "x86_64-windows" ]; then
echo "--- Downloading Windows version directly from bldr: $windows_ident"
sudo curl "https://bldr.habitat.sh/v1/depot/pkgs/$windows_ident/download?target=$BUILD_PKG_TARGET" -o "/hab/cache/artifacts/$hab_artifact"
else
sudo "${hab_binary:?}" pkg install core/hab --channel="${channel}"
sudo HAB_LICENSE="accept-no-persist" "${hab_binary:?}" pkg install core/hab --channel="${channel}"
fi

# We upload to the stable channel, but we don't *publish* until
# later.
#
# -s = skip publishing
# -r = the repository to upload to
sudo HAB_BLDR_CHANNEL="${channel}" \
sudo HAB_LICENSE="accept-no-persist" \
HAB_BLDR_CHANNEL="${channel}" \
BINTRAY_USER="${BINTRAY_USER}" \
BINTRAY_KEY="${BINTRAY_KEY}" \
BINTRAY_PASSPHRASE="${BINTRAY_PASSPHRASE}" \
Expand Down

0 comments on commit 945127a

Please sign in to comment.