Skip to content

Commit 1e06fd0

Browse files
committed
fix(ci): Include Linux distro version in RPM's artifact name
This is a minor follow-up fix to 669533c. After that commit, build artifacts for Fedora and openSUSE lacked the distro version at the end of their file names, i.e.: - "notes-2.3.0-1.x86_64-qt6-fedora-38" wrongly became: "notes-2.3.0-1.x86_64-qt6-fedora" - "notes-2.3.0-1.x86_64-qt6-opensuse-leap-15.5" wrongly became: "notes-2.3.0-1.x86_64-qt6-opensuse-leap" This change now includes the version as well.
1 parent d2455cf commit 1e06fd0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Dockerfiles/rpm_entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ rpmlint "${BUILD_DIR}"/*.rpm
8686
if [ -f /GITHUB_OUTPUT ]; then
8787
msg "Note: File '/GITHUB_OUTPUT' exists, assuming we're running on GitHub Actions."
8888
distro_id=$(grep -oPm1 '^ID="?\K[^"]+' /etc/os-release)
89-
distro_codename=$(grep -oPm1 '^VERSION_CODENAME="?\K[^"]+' /etc/os-release || echo '')
90-
echo "distro_name=${distro_id}${distro_codename:+-"$distro_codename"}" >>'/GITHUB_OUTPUT'
89+
version_id=$(grep -oPm1 '^VERSION_ID="?\K[^"]+' /etc/os-release || echo '')
90+
echo "distro_name=${distro_id}${version_id:+-"$version_id"}" >>'/GITHUB_OUTPUT'
9191

9292
if ! rpm_path=$(find "${BUILD_DIR}" -maxdepth 1 -name '*.rpm' -print -quit); then
9393
msg 'Fatal: Unable to find rpm package'

0 commit comments

Comments
 (0)