From d22a4cb262c984241863d8dec1e498d83733ac6f Mon Sep 17 00:00:00 2001
From: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed, 11 Sep 2024 15:19:01 +0300
Subject: [PATCH] all: resolve tmp todos

---
 bamboo-specs/test.yaml        | 23 +----------------------
 scripts/make/build-release.sh |  7 +++----
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml
index b26d98802d2..29a8bae55f3 100644
--- a/bamboo-specs/test.yaml
+++ b/bamboo-specs/test.yaml
@@ -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':
@@ -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':
diff --git a/scripts/make/build-release.sh b/scripts/make/build-release.sh
index 640344263f8..581081d552c 100644
--- a/scripts/make/build-release.sh
+++ b/scripts/make/build-release.sh
@@ -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"