Skip to content

Fix service name for Debian DxM packaging #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MichielOda merged 2 commits into from
Jul 24, 2026
Merged

Fix service name for Debian DxM packaging #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e05bc9
Fix service name for Debian DxM packaging
MichielOda Jul 24, 2026
cf3c47a
Fix test
MichielOda Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions .github/actions/package-debian/package-debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# (DEBIAN/{control,conffiles,preinst,postinst,prerm,postrm} + systemd unit);
# * each project is staged in its OWN temp tree so multiple .debs never share or
# clobber a single packaging/Debian/content;
# * the project folder name is the Debian service name.
# * the systemd unit filename (minus the .service extension) is the Debian service name.
#
# Env (set by action.yml):
# PROJECTS : comma-separated project paths relative to the repo root.
Expand Down Expand Up @@ -57,7 +57,6 @@ for project in "${projects[@]}"; do
project=$(printf '%s' "$project" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
[[ -z "$project" ]] && continue

service_name=$(basename "$project")
skeleton="$project/packaging/Debian"

# 0. Validate: every listed project must ship the Debian skeleton.
Expand All @@ -66,6 +65,21 @@ for project in "${projects[@]}"; do
exit 1
fi

# Derive the Debian service name from the systemd unit shipped in the skeleton
# (packaging/Debian/content/lib/systemd/system/<service>.service) rather than the
# project folder name.
systemd_dir="$skeleton/content/lib/systemd/system"
mapfile -t service_files < <(find "$systemd_dir" -maxdepth 1 -type f -name '*.service' 2>/dev/null | sort)
if [[ "${#service_files[@]}" -eq 0 ]]; then
echo "::error::Project '$project' has no *.service unit in $systemd_dir; cannot determine the Debian service name." >&2
exit 1
fi
if [[ "${#service_files[@]}" -gt 1 ]]; then
echo "::error::Project '$project' has multiple *.service units in $systemd_dir; expected exactly one." >&2
exit 1
fi
service_name=$(basename "${service_files[0]}" .service)

echo "── Packaging '$service_name' ──"
staging=$(mktemp -d)

Expand Down
28 changes: 20 additions & 8 deletions .github/workflows/Test composite actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,14 +695,26 @@ jobs:
sed -i 's#</Project># <ItemGroup><Content Include="appsettings.json" CopyToPublishDirectory="PreserveNewest" /></ItemGroup>\n</Project>#' "$svc/$svc.csproj"
mkdir -p "$svc/packaging/Debian/content/DEBIAN"
lower=$(echo "$svc" | tr '[:upper:]' '[:lower:]')
# Service name is derived from the systemd unit filename, NOT the project
# folder name, so give the unit a deliberately different name.
unit="dataminer-$lower"
mkdir -p "$svc/packaging/Debian/content/lib/systemd/system"
{
echo "Package: $lower"
echo "[Unit]"
echo "Description=Test service $svc"
echo "[Service]"
echo "ExecStart=/opt/skyline-communications/$unit/$svc"
echo "[Install]"
echo "WantedBy=multi-user.target"
} > "$svc/packaging/Debian/content/lib/systemd/system/$unit.service"
{
echo "Package: $unit"
echo "Version: <VERSION>"
echo "Architecture: amd64"
echo "Maintainer: Skyline Communications <devops@skyline.be>"
echo "Description: Test service $svc"
} > "$svc/packaging/Debian/content/DEBIAN/control"
echo "/etc/skyline-communications/$svc/appsettings.json" > "$svc/packaging/Debian/content/DEBIAN/conffiles"
echo "/etc/skyline-communications/$unit/appsettings.json" > "$svc/packaging/Debian/content/DEBIAN/conffiles"
done

- name: Invoke composite (pre-release version, no SBOM)
Expand All @@ -720,13 +732,13 @@ jobs:
run: |
ls -l deb-output
test "$PACKAGE_COUNT" = "2"
test -f "deb-output/SvcOne_1.2.3~beta.1.deb"
test -f "deb-output/SvcTwo_1.2.3~beta.1.deb"
version=$(dpkg-deb --field "deb-output/SvcOne_1.2.3~beta.1.deb" Version)
test -f "deb-output/dataminer-svcone_1.2.3~beta.1.deb"
test -f "deb-output/dataminer-svctwo_1.2.3~beta.1.deb"
version=$(dpkg-deb --field "deb-output/dataminer-svcone_1.2.3~beta.1.deb" Version)
test "$version" = "1.2.3~beta.1"
dpkg-deb --contents "deb-output/SvcOne_1.2.3~beta.1.deb" | grep -q 'opt/skyline-communications/SvcOne/'
dpkg-deb --contents "deb-output/SvcOne_1.2.3~beta.1.deb" | grep -q 'etc/skyline-communications/SvcOne/appsettings.json'
dpkg-deb --contents "deb-output/SvcTwo_1.2.3~beta.1.deb" | grep -q 'opt/skyline-communications/SvcTwo/'
dpkg-deb --contents "deb-output/dataminer-svcone_1.2.3~beta.1.deb" | grep -q 'opt/skyline-communications/dataminer-svcone/'
dpkg-deb --contents "deb-output/dataminer-svcone_1.2.3~beta.1.deb" | grep -q 'etc/skyline-communications/dataminer-svcone/appsettings.json'
dpkg-deb --contents "deb-output/dataminer-svctwo_1.2.3~beta.1.deb" | grep -q 'opt/skyline-communications/dataminer-svctwo/'

remove-wix-projects:
name: remove-wix-projects
Expand Down
Loading