mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pull request: reduce-build-parallelism 

Merge in DNS/adguard-home from reduce-build-parallelism to master

Squashed commit of the following:

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

    all: reduce build parallelism
This commit is contained in:
Ainar Garipov 2023-01-11 14:48:46 +03:00
parent d8d7a5c335
commit 68bc9969b7
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bamboo-specs/release.yaml
View File

@ -109,7 +109,8 @@
CHANNEL=${bamboo.channel}\ CHANNEL=${bamboo.channel}\
GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\ GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
FRONTEND_PREBUILT=1\ FRONTEND_PREBUILT=1\
VERBOSE=1\ PARALLELISM=1\
VERBOSE=2\
build-release build-release
# TODO(a.garipov): Use more fine-grained artifact rules. # TODO(a.garipov): Use more fine-grained artifact rules.
'artifacts': 'artifacts':

2
scripts/make/build-docker.sh
View File

@ -85,7 +85,7 @@ in
esac esac
readonly docker_image_full_name docker_tags 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 # COPY them later. DO NOT remove the trailing underscores. See file
# scripts/make/Dockerfile. # scripts/make/Dockerfile.
dist_docker="${dist_dir}/docker" dist_docker="${dist_dir}/docker"

13
scripts/make/build-release.sh
View File

@ -7,22 +7,18 @@
# Experienced readers may find it overly verbose. # Experienced readers may find it overly verbose.
# The default verbosity level is 0. Show log messages if the caller requested # 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 greater than 0. Show the environment and every command that
# verbosity level is greater than 1. Show the environment if the verbosity # is run if the verbosity level is greater than 1. Otherwise, print nothing.
# level is greater than 2. Otherwise, print nothing.
# #
# The level of verbosity for the build script is the same minus one level. See # The level of verbosity for the build script is the same minus one level. See
# below in build(). # below in build().
verbose="${VERBOSE:-0}" verbose="${VERBOSE:-0}"
readonly verbose readonly verbose
if [ "$verbose" -gt '2' ] if [ "$verbose" -gt '1' ]
then then
env env
set -x set -x
elif [ "$verbose" -gt '1' ]
then
set -x
fi fi
# By default, sign the packages, but allow users to skip that step. # 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 # 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. # 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\ env\
GOARCH="$build_arch"\ GOARCH="$build_arch"\
GOARM="${build_arm#-}"\ GOARM="${build_arm#-}"\