Skip to content

Commit

Permalink
Use build-deb from the work directory instead of copying it inside th…
Browse files Browse the repository at this point in the history
…e docker image
  • Loading branch information
naguirre committed Nov 11, 2023
1 parent d3bb143 commit 6f02a4b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-deb-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
pysemver bump prerelease ${{ steps.fetch-latest-release.outputs.latest-release }}
export release=$(pysemver bump prerelease ${{ steps.fetch-latest-release.outputs.latest-release }})
echo "release=$release"
/build-deb.sh $release && echo release=$release >> $GITHUB_OUTPUT
/work/build-deb.sh $release && echo release=$release >> $GITHUB_OUTPUT
- name: Upload artifacts
uses: actions/upload-artifact@v2
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release-deb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ on:
workflow_dispatch:
inputs:
vincrement:
description: 'Package version increment (major.feature.bug)'
description: 'Package version increment (major.minor.patch)'
required: true
default: 'bug'
default: 'release'
type: choice
options:
- major
- feature
- bug
- minor
- patch

jobs:
build-and-push-deb-pkg:
Expand Down Expand Up @@ -40,7 +40,7 @@ jobs:
image: ghcr.io/calaos/debian_deb_build_base
options: -v ${{ github.workspace }}:/work
run: |
/build-deb.sh ${{ steps.bump_version.outputs.release }}
/work/build-deb.sh ${{ steps.bump_version.outputs.release }}
- name: Upload artifacts
uses: actions/upload-artifact@v2
Expand Down
2 changes: 1 addition & 1 deletion docker/build-deb.sh → build-deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ pkg_name=$(grep "Package: " debian/control | sed 's/Package: //')
apt-get build-dep -y .
dpkg-buildpackage -us -uc -b

mkdir $workdir/pkg
mkdir -p $workdir/pkg
mv ../"${pkg_name}"_*.deb $workdir/pkg
2 changes: 0 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@ RUN apt -y update && \
apt -y upgrade && \
apt-get install -yq --no-install-recommends devscripts debhelper dpkg-dev fakeroot lintian sudo \
pkgconf golang libbtrfs-dev libdevmapper-dev libgpgme-dev git python3-semver

COPY build-deb.sh /build-deb.sh

0 comments on commit 6f02a4b

Please sign in to comment.