Add package versions to the rpm and deb filenames

Author: Mikrz

build-packages.sh

@@ -1,6 +1,13 @@
 #!/bin/bash
-VERSION=$(git describe --tags --always --match "[0-9][0-9][0-9][0-9].*.*")
-echo $VERSION
+<<<<<<< Updated upstream
+TAG_VERSION=$(git describe --tags --always --match "[0-9][0-9][0-9][0-9].*.*")
+OUT_VERSION=$(echo $TAG_VERSION | sed -E 's/([0-9]{4}\.[0-9]{1,2}\.[0-9]+-[0-9]+).*/\1/')
+echo $TAG_VERSION
+=======
+ORIG_VERSION=$(git describe --tags --always --match "[0-9][0-9][0-9][0-9].*.*")
+OUT_VERSION=$(echo $ORIG_VERSION | sed -E 's/([0-9]{4}\.[0-9]{1,2}\.[0-9]+-[0-9]+).*/\1/')
+echo $ORIG_VERSION
+>>>>>>> Stashed changes
 
 # Disable FIPS module in go-boring
 export GOEXPERIMENT=noboringcrypto
@@ -10,7 +17,7 @@ export CGO_ENABLED=0
 export ARTIFACT_DIR=artifacts/
 mkdir -p $ARTIFACT_DIR
 
-linuxArchs=("386" "amd64" "arm" "armhf" "arm64")
+linuxArchs=("amd64")
 export TARGET_OS=linux
 for arch in ${linuxArchs[@]}; do
     unset TARGET_ARM
@@ -29,10 +36,10 @@ for arch in ${linuxArchs[@]}; do
     fi
 
     make cloudflared-deb
-    mv cloudflared\_$VERSION\_$arch.deb $ARTIFACT_DIR/cloudflared-linux-$arch.deb
+    mv cloudflared\_$TAG_VERSION\_$arch.deb $ARTIFACT_DIR/cloudflared-$OUT_VERSION-linux-$arch.deb
 
     # rpm packages invert the - and _ and use x86_64 instead of amd64.
-    RPMVERSION=$(echo $VERSION|sed -r 's/-/_/g')
+    RPMVERSION=$(echo $TAG_VERSION|sed -r 's/-/_/g')
     RPMARCH=$arch
     if [ $arch == "amd64" ];then
         RPMARCH="x86_64"
@@ -41,8 +48,8 @@ for arch in ${linuxArchs[@]}; do
         RPMARCH="aarch64"
     fi
     make cloudflared-rpm
-    mv cloudflared-$RPMVERSION-1.$RPMARCH.rpm $ARTIFACT_DIR/cloudflared-linux-$RPMARCH.rpm
+    mv cloudflared-$RPMVERSION-1.$RPMARCH.rpm $ARTIFACT_DIR/cloudflared-$OUT_VERSION-linux-$RPMARCH.rpm
 
     # finally move the linux binary as well.
-    mv ./cloudflared $ARTIFACT_DIR/cloudflared-linux-$arch
+    mv ./cloudflared $ARTIFACT_DIR/cloudflared-$OUT_VERSION-linux-$arch
 done