From 4dc3f400d6aa21c84f3a6ec5246fbfa5df80a9be Mon Sep 17 00:00:00 2001
From: Tobias Bossert <tobias.bossert@fastpath.ch>
Date: Wed, 5 May 2021 12:54:37 +0200
Subject: [PATCH] Attempt to fix debhelper bug, fixed build-release.yaml syntax

---
 .github/actions/build-release-action/Dockerfile  |  3 ++-
 .github/actions/build-release-action/make-deb.sh | 13 +++++++++++--
 .github/workflows/build-release.yaml             | 12 ++++++------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/.github/actions/build-release-action/Dockerfile b/.github/actions/build-release-action/Dockerfile
index f855f6dd..c0e032c7 100644
--- a/.github/actions/build-release-action/Dockerfile
+++ b/.github/actions/build-release-action/Dockerfile
@@ -24,7 +24,8 @@ RUN apt-get -y update && \
         nodejs \
         libkrb5-dev \
         libqrencode-dev \
-        g++
+        g++ \
+        zlib1g-dev
         
 COPY make-deb.sh /make-deb.sh
 
diff --git a/.github/actions/build-release-action/make-deb.sh b/.github/actions/build-release-action/make-deb.sh
index dc404fa2..9e83dbd0 100755
--- a/.github/actions/build-release-action/make-deb.sh
+++ b/.github/actions/build-release-action/make-deb.sh
@@ -1,10 +1,19 @@
 #!/bin/sh
 set -ex
 cd /github/workspace/
+
+# workaround for debhelper bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=897569
+mkdir -p deb_build_home
+ls | grep -v deb_build_home | xargs mv -t deb_build_home # move everything except deb_build_home
+cd deb_build_home
+
 dh_clean
 dpkg-buildpackage -us -uc -nc
+
+# set filename
 release_code_name=$(lsb_release --codename | sed 's/Codename:\s*//')
 package_name=$(basename ../*.deb | sed 's/.deb$//')_$release_code_name.deb
+mv ../*.deb ../$package_name
 
-mv ../*.deb $package_name
-echo "::set-output name=package_name::$package_name"
+# set action output
+echo "::set-output name=package_name::$package_name"
\ No newline at end of file
diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml
index d2a70d94..d063de3c 100644
--- a/.github/workflows/build-release.yaml
+++ b/.github/workflows/build-release.yaml
@@ -9,24 +9,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        RELEASE:
-          - Ubuntu:
+        include:
+          - ubuntu: 18.04
             docker_file: Dockerfile
             image_version_tag: '18.04'
-          - Ubuntu:
+          - ubuntu: 20.04
             docker_file: Dockerfile
             image_version_tag: '20.04'
 
     runs-on: ubuntu-latest
-    name: Build package defined in ${{ matrix.RELEASE.docker_file }} for tag ${{ matrix.RELEASE.image_version_tag }}
+    name: Build package defined in ${{ matrix.docker_file }} for tag ${{ matrix.image_version_tag }}
     steps:
       - uses: actions/checkout@v1
       - name: Run docker build
         id: build_package
         uses: ./.github/actions/build-release-action
         with:
-          docker_file: ${{ matrix.RELEASE.docker_file }}
-          image_version_tag: ${{ matrix.RELEASE.image_version_tag }}
+          docker_file: ${{ matrix.docker_file }}
+          image_version_tag: ${{ matrix.image_version_tag }}
 
       - name: Release deb files
         uses: softprops/action-gh-release@v1