diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml index a43dca2b..bfdfff3b 100644 --- a/bamboo-specs/release.yaml +++ b/bamboo-specs/release.yaml @@ -109,7 +109,8 @@ CHANNEL=${bamboo.channel}\ GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\ FRONTEND_PREBUILT=1\ - VERBOSE=1\ + PARALLELISM=1\ + VERBOSE=2\ build-release # TODO(a.garipov): Use more fine-grained artifact rules. 'artifacts': diff --git a/scripts/make/build-docker.sh b/scripts/make/build-docker.sh index 917e7771..38b1ea30 100644 --- a/scripts/make/build-docker.sh +++ b/scripts/make/build-docker.sh @@ -85,7 +85,7 @@ in esac readonly docker_image_full_name docker_tags -# Copy the binaries into a new directory under new names, so that it's eaiser to +# Copy the binaries into a new directory under new names, so that it's easier to # COPY them later. DO NOT remove the trailing underscores. See file # scripts/make/Dockerfile. dist_docker="${dist_dir}/docker" diff --git a/scripts/make/build-release.sh b/scripts/make/build-release.sh index 1c8cb9c0..72ba8aeb 100644 --- a/scripts/make/build-release.sh +++ b/scripts/make/build-release.sh @@ -7,22 +7,18 @@ # Experienced readers may find it overly verbose. # The default verbosity level is 0. Show log messages if the caller requested -# verbosity level greater than 0. Show every command that is run if the -# verbosity level is greater than 1. Show the environment if the verbosity -# level is greater than 2. Otherwise, print nothing. +# verbosity level greater than 0. Show the environment and every command that +# is run if the verbosity level is greater than 1. Otherwise, print nothing. # # The level of verbosity for the build script is the same minus one level. See # below in build(). verbose="${VERBOSE:-0}" readonly verbose -if [ "$verbose" -gt '2' ] +if [ "$verbose" -gt '1' ] then env set -x -elif [ "$verbose" -gt '1' ] -then - set -x fi # By default, sign the packages, but allow users to skip that step. @@ -188,9 +184,6 @@ build() { # # Set GOARM and GOMIPS to an empty string if $build_arm and $build_mips are # the zero value by removing the hyphen as if it's a prefix. - # - # Don't use quotes with $build_par because we want an empty space if - # parallelism wasn't set. env\ GOARCH="$build_arch"\ GOARM="${build_arm#-}"\