Skip to content

Commit 4dc3f40

Browse files
committed
Attempt to fix debhelper bug, fixed build-release.yaml syntax
1 parent c7e15e2 commit 4dc3f40

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

.github/actions/build-release-action/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ RUN apt-get -y update && \
2424
nodejs \
2525
libkrb5-dev \
2626
libqrencode-dev \
27-
g++
27+
g++ \
28+
zlib1g-dev
2829

2930
COPY make-deb.sh /make-deb.sh
3031

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
11
#!/bin/sh
22
set -ex
33
cd /github/workspace/
4+
5+
# workaround for debhelper bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=897569
6+
mkdir -p deb_build_home
7+
ls | grep -v deb_build_home | xargs mv -t deb_build_home # move everything except deb_build_home
8+
cd deb_build_home
9+
410
dh_clean
511
dpkg-buildpackage -us -uc -nc
12+
13+
# set filename
614
release_code_name=$(lsb_release --codename | sed 's/Codename:\s*//')
715
package_name=$(basename ../*.deb | sed 's/.deb$//')_$release_code_name.deb
16+
mv ../*.deb ../$package_name
817

9-
mv ../*.deb $package_name
10-
echo "::set-output name=package_name::$package_name"
18+
# set action output
19+
echo "::set-output name=package_name::$package_name"

.github/workflows/build-release.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
RELEASE:
13-
- Ubuntu:
12+
include:
13+
- ubuntu: 18.04
1414
docker_file: Dockerfile
1515
image_version_tag: '18.04'
16-
- Ubuntu:
16+
- ubuntu: 20.04
1717
docker_file: Dockerfile
1818
image_version_tag: '20.04'
1919

2020
runs-on: ubuntu-latest
21-
name: Build package defined in ${{ matrix.RELEASE.docker_file }} for tag ${{ matrix.RELEASE.image_version_tag }}
21+
name: Build package defined in ${{ matrix.docker_file }} for tag ${{ matrix.image_version_tag }}
2222
steps:
2323
- uses: actions/checkout@v1
2424
- name: Run docker build
2525
id: build_package
2626
uses: ./.github/actions/build-release-action
2727
with:
28-
docker_file: ${{ matrix.RELEASE.docker_file }}
29-
image_version_tag: ${{ matrix.RELEASE.image_version_tag }}
28+
docker_file: ${{ matrix.docker_file }}
29+
image_version_tag: ${{ matrix.image_version_tag }}
3030

3131
- name: Release deb files
3232
uses: softprops/action-gh-release@v1

0 commit comments

Comments
 (0)