PMM-13399 trying to fix build.

percona · Oct 19, 2024 · 0ed3064 · 0ed3064
1 parent 3148f01
commit 0ed3064
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/build/packages/deb/files b/build/packages/deb/files
@@ -40,7 +40,7 @@ install -m 0755 bin/pt-summary $RPM_BUILD_ROOT/usr/local/percona/pmm/tools/
 install -m 0755 bin/pt-mysql-summary $RPM_BUILD_ROOT/usr/local/percona/pmm/tools/
 install -m 0755 bin/pt-mongodb-summary $RPM_BUILD_ROOT/usr/local/percona/pmm/tools/
 install -m 0755 bin/pt-pg-summary $RPM_BUILD_ROOT/usr/local/percona/pmm/tools/
-install -m 0755 pkg/linux_amd64/nomad $RPM_BUILD_ROOT/usr/local/percona/pmm/tools/
+install -m 0755 bin/nomad $RPM_BUILD_ROOT/usr/local/percona/pmm/tools/
 
 install -m 0660 example.prom $RPM_BUILD_ROOT/usr/local/percona/pmm/collectors/textfile-collector/low-resolution/
 install -m 0660 example.prom $RPM_BUILD_ROOT/usr/local/percona/pmm/collectors/textfile-collector/medium-resolution/

diff --git a/build/packages/rpm/client/pmm-client.spec b/build/packages/rpm/client/pmm-client.spec
@@ -100,7 +100,7 @@ install -m 0755 bin/pt-summary $RPM_BUILD_ROOT/usr/local/percona/pmm/tools
 install -m 0755 bin/pt-mysql-summary $RPM_BUILD_ROOT/usr/local/percona/pmm/tools
 install -m 0755 bin/pt-mongodb-summary $RPM_BUILD_ROOT/usr/local/percona/pmm/tools
 install -m 0755 bin/pt-pg-summary $RPM_BUILD_ROOT/usr/local/percona/pmm/tools
-install -m 0755 pkg/linux_amd64/nomad $RPM_BUILD_ROOT/usr/local/percona/pmm/tools
+install -m 0755 bin/nomad $RPM_BUILD_ROOT/usr/local/percona/pmm/tools
 install -m 0660 example.prom $RPM_BUILD_ROOT/usr/local/percona/pmm/collectors/textfile-collector/low-resolution/
 install -m 0660 example.prom $RPM_BUILD_ROOT/usr/local/percona/pmm/collectors/textfile-collector/medium-resolution/
 install -m 0660 example.prom $RPM_BUILD_ROOT/usr/local/percona/pmm/collectors/textfile-collector/high-resolution/

diff --git a/build/scripts/build-client-binary b/build/scripts/build-client-binary
@@ -113,6 +113,7 @@ main() {
 
     echo ${pmm_version} > ${binary_dir}/VERSION
 
+    copy_component "nomad" "pkg/linux_amd64/nomad" "nomad"
     copy_component "pmm" "build/packages/rpm/client" "rpm"
     copy_component "pmm" "build/packages/config" "config"
     copy_component "pmm" "build/packages/deb" "debian"