PMM-12899 fix the regular expressions

percona · Mar 17, 2024 · 224eefe · 224eefe
1 parent 11b2ade
commit 224eefe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/build/local/build.sh b/build/local/build.sh
@@ -63,4 +63,4 @@ $PATH_TO_SCRIPTS/build-server-rpm percona-dashboards grafana-dashboards
 # $PATH_TO_SCRIPTS/build-server-rpm dbaas-tools
 # $PATH_TO_SCRIPTS/build-server-rpm pmm-dump
 # $PATH_TO_SCRIPTS/build-server-rpm grafana-db-migrator
-# $PATH_TO_SCRIPTS/build-server-rpm vmproxy pmm
+# $PATH_TO_SCRIPTS/build-server-rpm vmproxy pmm
diff --git a/build/scripts/build-client-binary b/build/scripts/build-client-binary
@@ -144,8 +144,8 @@ main() {
     rm -rf ${binary_tarball}
     mkdir -p $(dirname ${binary_tarball}) || :
 
-    # Removes pmm binary in case this is not a PR build - such as RC/GA build
-    if [ "$(basename ${root_dir})" != pmm-submodules_PR-* ] && [ -n "$CI" ]; then
+    # Removes pmm binary (aka CLI) in case this is not a PR build - such as RC/GA build
+    if [[ "$(basename ${root_dir})" != pmm*-submodules_PR-* ]]; then
         rm -f "${binary_dir}/bin/pmm"
     fi
 

diff --git a/build/scripts/vars b/build/scripts/vars
@@ -19,11 +19,7 @@ full_pmm_version=${pmm_base_version}-${pmm_branch}-$(git rev-parse --short HEAD)
 # Replace '/' with '-' to prevent sed from failing on dependabot-authored PRs
 full_pmm_version=${full_pmm_version//\//-}
 
-# TODO Maybe it makes sense to use variable from job here
-if [[ ${pmm_branch} =~ release-* || \
-      ${pmm_branch} =~ pmm-2.* || \
-      ${pmm_branch} == PMM-2.0 || \
-      ${pmm_branch} == "main" ]]; then
+if [[ "${pmm_branch}" =~ ^pmm-2.|^PMM-2.0$|^pmm-3.|^main$ ]]; then
     full_pmm_version=${pmm_base_version}
 fi