librewolf
/
bunkerized-nginx
mirror of https://github.com/bunkerity/bunkerized-nginx
4
0
Fork 1
Code Issues Projects Releases Wiki Activity

ci/cd - fix missing version in linux package name

This commit is contained in:
florian 2023-05-08 16:37:43 +02:00
parent 136f68cd3b
commit e14475de4a
No known key found for this signature in database
GPG Key ID: 3D80806F12602A7C
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/linux-build.yml vendored
View File

@ -124,7 +124,7 @@ jobs:
docker save local/bunkerweb-${{ inputs.LINUX }}:latest | ssh -C root@arm docker load docker save local/bunkerweb-${{ inputs.LINUX }}:latest | ssh -C root@arm docker load
scp ./src/linux/package.sh root@arm:/opt scp ./src/linux/package.sh root@arm:/opt
ssh root@arm chmod +x /opt/package.sh 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 }} scp -r root@arm:/root/package-${{ inputs.LINUX }} ./package-${{ inputs.LINUX }}
env: env:
LARCH: ${{ env.LARCH }} LARCH: ${{ env.LARCH }}

3
src/linux/package.sh
View File

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