all: resolve tmp todos

This commit is contained in:
Eugene Burkov 2024-09-11 15:19:01 +03:00
parent 4574b050ba
commit d22a4cb262
2 changed files with 4 additions and 26 deletions

View File

@ -145,12 +145,6 @@
'tasks': 'tasks':
- 'checkout': - 'checkout':
'force-clean-build': true 'force-clean-build': true
# TODO(e.burkov): !! Remove after test.
- 'checkout':
'repository': 'bamboo-deploy-publisher'
# The paths are always relative to the working directory.
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script': - 'script':
'interpreter': 'SHELL' 'interpreter': 'SHELL'
'scripts': 'scripts':
@ -159,28 +153,13 @@
set -e -f -u -x set -e -f -u -x
# TODO(e.burkov): !! remove
ls -l -a .
ls -l -a ..
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
# Run the build with the specified channel.
echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
| awk '{ gsub(/\\n/, "\n"); print; }'\
| gpg --import --batch --yes
make\ make\
ARCH="amd64"\ ARCH="amd64"\
CHANNEL=${bamboo.channel}\ CHANNEL=${bamboo.channel}\
GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
DEPLOY_SCRIPT_PATH="./bamboo-deploy-publisher/deploy.sh"\
SIGNER_API_KEY="${bamboo.adguardHomeWinSignerSecretApiKey}"\
FRONTEND_PREBUILT=1\ FRONTEND_PREBUILT=1\
OS="windows darwin linux"\ OS="windows darwin linux"\
PARALLELISM=1\ PARALLELISM=1\
SIGN=1\ SIGN=0\
VERBOSE=2\ VERBOSE=2\
build-release build-release
'requirements': 'requirements':

View File

@ -180,10 +180,9 @@ sign() {
return return
# TODO(e.burkov): Enable for all releases. # TODO(e.burkov): Enable for all releases.
# TODO(e.burkov): !! Uncomment after test. elif [ "$channel" != 'beta' ]
# elif [ "$channel" != 'beta' ] then
# then return
# return
fi fi
signed_bin_path="${sign_bin_path}.signed" signed_bin_path="${sign_bin_path}.signed"