Skip to content

Commit dff1bc9

Browse files
committed
fix: github debian build action
1 parent 6e7ba9f commit dff1bc9

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.github/workflows/build-deb.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,7 @@ jobs:
5858
apt-get update
5959
apt-get install -y build-essential devscripts debhelper autoconf-archive autotools-dev pkg-config sed git tar gzip curl jq libyaml-cpp-dev rsync
6060
61-
CODENAME=$(lsb_release -sc)
62-
curl -fsSL https://deb.burger-system.de/deb.burger-system.de.gpg | tee /usr/share/keyrings/deb.burger-system.de.gpg > /dev/null
63-
echo "deb [arch=amd64 signed-by=/usr/share/keyrings/deb.burger-system.de.gpg] https://deb.burger-system.de/debian ${CODENAME} main" | tee /etc/apt/sources.list.d/burger-system.list > /dev/null
64-
61+
curl -fsSL https://deb.burger-system.de/setup.sh | bash > /dev/null
6562
apt-get update
6663
apt-get install -y robotkernel-service-helper robotkernel-dev
6764
@@ -82,20 +79,23 @@ jobs:
8279
shell: bash
8380
run: |
8481
# baue mit dpkg-buildpackage (ohne signieren)
82+
export DEBEMAIL="robert.burger@dlr.de"
83+
export DEBFULLNAME="Robert Burger"
8584
CODENAME=$(lsb_release -sc)
86-
DEBEMAIL="robert.burger@dlr.de"
87-
DEBFULLNAME="Robert Burger"
8885
VERSION=$(dpkg-parsechangelog --show-field Version)
86+
PRE_VERSION="pre${GITHUB_RUN_NUMBER}"
8987
9088
# Check if version already contains codename suffix
9189
if [[ "$VERSION" == *"~${CODENAME}"* || "$VERSION" == *"+${CODENAME}"* ]]; then
9290
echo "Version already contains codename suffix, skipping dch."
9391
else
94-
# If there's already a ~ in version (like ~pre1), add +codename
95-
if [[ "$VERSION" == *"~"* ]]; then
96-
dch --local +${CODENAME} --distribution ${CODENAME} "Build for ${CODENAME}"
92+
if [[ ! $GITHUB_REF =~ ^refs/tags/ ]]; then
93+
# Not a tag, so add ~pre<x>
94+
FULL_VERSION="${VERSION}~${PRE_VERSION}-1~${CODENAME}-pre"
95+
dch -b --newversion "${FULL_VERSION}" --distribution "${CODENAME}-pre" "Pre-release for ${CODENAME}-pre"
9796
else
98-
dch --local ~${CODENAME} --distribution ${CODENAME} "Build for ${CODENAME}"
97+
FULL_VERSION="${VERSION}-1~${CODENAME}"
98+
dch --newversion "${FULL_VERSION}" --distribution "${CODENAME}" "Pre-release for ${CODENAME}"
9999
fi
100100
fi
101101

debian/changelog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
service-provider-file-protocol (6.0.0~pre2) unstable; urgency=low
1+
service-provider-file-protocol (6.0.0) unstable; urgency=low
22

33
* fix: new conant_template
44
* update: debian desc

0 commit comments

Comments
 (0)