Skip to content

Commit

Permalink
all: resolve tmp todos
Browse files Browse the repository at this point in the history
  • Loading branch information
EugeneOne1 committed Sep 11, 2024
1 parent 4574b05 commit d22a4cb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 26 deletions.
23 changes: 1 addition & 22 deletions bamboo-specs/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,6 @@
'tasks':
- 'checkout':
'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':
'interpreter': 'SHELL'
'scripts':
Expand All @@ -159,28 +153,13 @@
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\
ARCH="amd64"\
CHANNEL=${bamboo.channel}\
GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
DEPLOY_SCRIPT_PATH="./bamboo-deploy-publisher/deploy.sh"\
SIGNER_API_KEY="${bamboo.adguardHomeWinSignerSecretApiKey}"\
FRONTEND_PREBUILT=1\
OS="windows darwin linux"\
PARALLELISM=1\
SIGN=1\
SIGN=0\
VERBOSE=2\
build-release
'requirements':
Expand Down
7 changes: 3 additions & 4 deletions scripts/make/build-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,9 @@ sign() {

return
# TODO(e.burkov): Enable for all releases.
# TODO(e.burkov): !! Uncomment after test.
# elif [ "$channel" != 'beta' ]
# then
# return
elif [ "$channel" != 'beta' ]
then
return
fi

signed_bin_path="${sign_bin_path}.signed"
Expand Down

0 comments on commit d22a4cb

Please sign in to comment.