From e14475de4adc47b4708652cb65e472195c3997df Mon Sep 17 00:00:00 2001 From: florian Date: Mon, 8 May 2023 16:37:43 +0200 Subject: [PATCH] ci/cd - fix missing version in linux package name --- .github/workflows/linux-build.yml | 2 +- src/linux/package.sh | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 8c585267..5eaea0c4 100644 --- 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 index 7c5328a6..6f857298 100755 --- 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"