CICD: fix packaging with regards to binary changes

installer/rpm/algorand-devtools/algorand-devtools.spec

@@ -27,7 +27,7 @@ mkdir -p %{buildroot}/usr/bin
 # NOTE: keep in sync with scripts/build_deb.sh bin_files
 # NOTE: keep in sync with %files section below
 for f in carpenter msgpacktool tealdbg; do
-  install -m 755 ${ALGO_BIN}/${f} %{buildroot}/usr/bin/${f}
+  install -m 755 ${ALGO_TOOLS}/${f} %{buildroot}/usr/bin/${f}
 done
 
 mkdir -p %{buildroot}/etc/pki/rpm-gpg

scripts/build_deb.sh

@@ -52,7 +52,7 @@ mkdir -p "${PKG_ROOT}/usr/bin"
 
 if [ "${VARIATION}" = "" ]; then
     # NOTE: keep in sync with installer/rpm/algorand.spec
-    bin_files=("algocfg" "algod" "algoh" "algokey" "carpenter" "diagcfg" "goal" "kmd" "msgpacktool" "node_exporter" "tealdbg")
+    bin_files=("algocfg" "algod" "algoh" "algokey" "diagcfg" "goal" "kmd" "node_exporter")
 fi
 
 for bin in "${bin_files[@]}"; do

scripts/build_package.sh

@@ -77,7 +77,7 @@ DEFAULT_RELEASE_NETWORK=$(./scripts/compute_branch_release_network.sh "${DEFAULT
 mkdir ${PKG_ROOT}/bin
 
 # If you modify this list, also update this list in ./cmd/updater/update.sh backup_binaries()
-bin_files=("algocfg" "algotmpl" "algod" "algoh" "algokey" "diagcfg" "find-nodes.sh" "goal" "kmd" "msgpacktool" "node_exporter" "tealdbg" "update.sh" "updater" "COPYING")
+bin_files=("algocfg" "algotmpl" "algod" "algoh" "algokey" "diagcfg" "find-nodes.sh" "goal" "kmd" "node_exporter" "update.sh" "updater" "COPYING")
 for bin in "${bin_files[@]}"; do
     cp ${GOBIN}/${bin} ${PKG_ROOT}/bin
     if [ $? -ne 0 ]; then exit 1; fi
@@ -120,7 +120,7 @@ TOOLS_ROOT=${PKG_ROOT}/tools
 
 echo "Staging tools package files"
 
-bin_files=("algons" "carpenter" "coroner" "dispenser" "netgoal" "nodecfg" "pingpong" "loadgenerator" "COPYING" "dsign" "catchpointdump" "block-generator")
+bin_files=("algons" "carpenter" "coroner" "dispenser" "msgpacktool" "netgoal" "nodecfg" "pingpong" "loadgenerator" "COPYING" "dsign" "catchpointdump" "block-generator" "tealdbg")
 mkdir -p ${TOOLS_ROOT}
 for bin in "${bin_files[@]}"; do
     cp ${GOBIN}/${bin} ${TOOLS_ROOT}

scripts/release/mule/package/deb/package.sh

@@ -30,30 +30,32 @@ find tmp/node_pkgs -name "*${CHANNEL}*linux*${VERSION}*.tar.gz" | cut -d '/' -f3
     ARCH=$(echo "${OS_ARCH}" | cut -d '/' -f2)
     PKG_DIR="./tmp/node_pkgs/$OS_TYPE/$ARCH"
     mkdir -p "$PKG_DIR/bin"
-    ALGO_BIN="${PKG_DIR}/$CHANNEL/$OS_TYPE-$ARCH/bin"
-
+    ALGO_BIN_TOOLS_SRC="${PKG_DIR}/$CHANNEL/$OS_TYPE-$ARCH/bin"
+ 
     # NOTE: keep in sync with `./installer/rpm/algorand.spec`.
     if [[ "$ALGORAND_PACKAGE_NAME" =~ devtools ]]; then
         BIN_FILES=("carpenter" "msgpacktool" "tealdbg")
         UNATTENDED_UPGRADES_FILE="53algorand-devtools-upgrades"
         OUTPUT_DEB="$PKG_DIR/algorand-devtools_${CHANNEL}_${OS_TYPE}-${ARCH}_${VERSION}.deb"
         REQUIRED_ALGORAND_PKG=$("./scripts/compute_package_name.sh" "$CHANNEL")
+        # tools are in tools/ subdirectory instead of bin/
+        ALGO_BIN_TOOLS_SRC="${PKG_DIR}/$CHANNEL/$OS_TYPE-$ARCH/tools"
     else
         BIN_FILES=("algocfg" "algod" "algoh" "algokey" "diagcfg" "goal" "kmd" "node_exporter")
         UNATTENDED_UPGRADES_FILE="51algorand-upgrades"
         OUTPUT_DEB="$PKG_DIR/algorand_${CHANNEL}_${OS_TYPE}-${ARCH}_${VERSION}.deb"
     fi
 
     for binary in "${BIN_FILES[@]}"; do
-        cp "${ALGO_BIN}/$binary" "$PKG_ROOT/usr/bin"
+        cp "${ALGO_BIN_TOOLS_SRC}/$binary" "$PKG_ROOT/usr/bin"
         chmod 755 "$PKG_ROOT/usr/bin/$binary"
     done
 
     if [[ ! "$ALGORAND_PACKAGE_NAME" =~ devtools ]]; then
         mkdir -p "$PKG_ROOT/usr/lib/algorand"
         lib_files=("updater" "find-nodes.sh")
         for lib in "${lib_files[@]}"; do
-            cp "$ALGO_BIN/$lib" "$PKG_ROOT/usr/lib/algorand"
+            cp "$ALGO_BIN_TOOLS_SRC/$lib" "$PKG_ROOT/usr/lib/algorand"
             chmod g-w "$PKG_ROOT/usr/lib/algorand/$lib"
         done
 
@@ -144,15 +146,15 @@ EOF
 go version:
 EOF
 
-    /usr/local/go/bin/go version >> "$STATUSFILE"
+    go version >> "$STATUSFILE"
 
     ############################################################
 
     cat >> "$STATUSFILE" << EOF
 go env:
 EOF
 
-    /usr/local/go/bin/go env >> "$STATUSFILE"
+    go env >> "$STATUSFILE"
 
     ############################################################
 

scripts/release/mule/package/rpm/package.sh

@@ -21,6 +21,7 @@ find tmp/node_pkgs -name "*${CHANNEL}*linux*${VERSION}*.tar.gz" | cut -d '/' -f3
     ARCH_TYPE=$(echo "${OS_ARCH}" | cut -d '/' -f2)
     ARCH_UNAME=$(./scripts/release/common/cpu_name.sh ${ARCH_TYPE})
     ALGO_BIN="$REPO_DIR/tmp/node_pkgs/$OS_TYPE/$ARCH_TYPE/$CHANNEL/$OS_TYPE-$ARCH_TYPE/bin"
+    ALGO_TOOLS="$REPO_DIR/tmp/node_pkgs/$OS_TYPE/$ARCH_TYPE/$CHANNEL/$OS_TYPE-$ARCH_TYPE/tools"
     # A make target in Makefile.mule may pass the name as an argument.
     ALGORAND_PACKAGE_NAME=$(./scripts/compute_package_name.sh "$CHANNEL" "$PACKAGE_NAME")
 
@@ -32,6 +33,7 @@ find tmp/node_pkgs -name "*${CHANNEL}*linux*${VERSION}*.tar.gz" | cut -d '/' -f3
     export DEFAULT_RELEASE_NETWORK
     export REPO_DIR
     export ALGO_BIN
+    export ALGO_TOOLS
 
     RPMTMP=$(mktemp -d 2>/dev/null || mktemp -d -t "rpmtmp")
     trap 'rm -rf $RPMTMP' 0