Skip to content

Commit

Permalink
Pull request: reduce-build-parallelism
Browse files Browse the repository at this point in the history
Merge in DNS/adguard-home from reduce-build-parallelism to master

Squashed commit of the following:

commit 3c26331
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jan 11 14:40:46 2023 +0300

    all: reduce build parallelism
  • Loading branch information
ainar-g authored and heyxkhoa committed Mar 17, 2023
1 parent 886f496 commit 76fe53f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 12 deletions.
3 changes: 2 additions & 1 deletion bamboo-specs/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down
2 changes: 1 addition & 1 deletion scripts/make/build-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
13 changes: 3 additions & 10 deletions scripts/make/build-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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#-}"\
Expand Down

0 comments on commit 76fe53f

Please sign in to comment.