ci/cd - fix missing version in linux package name

bunkerity · May 8, 2023 · e14475d · e14475d
1 parent 136f68c
commit e14475d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -124,7 +124,7 @@ jobs:
           docker save local/bunkerweb-${{ inputs.LINUX }}:latest | ssh -C root@arm docker load
           scp ./src/linux/package.sh root@arm:/opt
           ssh root@arm chmod +x /opt/package.sh
-          ssh root@arm /opt/package.sh ${{ inputs.LINUX }} ${{ env.LARCH }}
+          ssh root@arm /opt/package.sh ${{ inputs.LINUX }} ${{ env.LARCH }} "$(cat src/VERSION | tr -d '\n')"
           scp -r root@arm:/root/package-${{ inputs.LINUX }} ./package-${{ inputs.LINUX }}
         env:
           LARCH: ${{ env.LARCH }}

diff --git a/src/linux/package.sh b/src/linux/package.sh
@@ -35,7 +35,10 @@ fi
 do_and_check_cmd mkdir "$package_dir"
 
 # Generate package
-version="$(cat src/VERSION | tr -d '\n')"
+version="$3"
+if [ -f "src/VERSION" ] ; then
+	version="$(cat src/VERSION | tr -d '\n')"
+fi
 type="deb"
 if [ "$linux" = "fedora" ] || [ "$linux" = "centos" ] || [ "$linux" = "rhel" ] ; then
 	type="rpm"