Skip to content

Fix RPM version to include build datetime for correct ordering when installing from COPR #210

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
pmtk merged 2 commits into from
Mar 27, 2026
Merged

Fix RPM version to include build datetime for correct ordering when installing from COPR #210

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
a334c06
Fix RPM version to include build datetime
pmtk Mar 25, 2026
bbe71d5
Fix copr workflows names
pmtk Mar 25, 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
2 changes: 1 addition & 1 deletion .github/workflows/copr-build-and-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: copr-build-test
name: copr-build-and-test

on:
workflow_call:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/copr-experimental.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: experimental-copr
name: copr-experimental

on:
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/copr-nightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: nightly-copr
name: copr-nightly

on:
schedule:
Expand Down
5 changes: 3 additions & 2 deletions src/image/build-rpms.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@ if [[ $(git tag -l "${USHIFT_GITREF}") ]]; then
MICROSHIFT_VERSION="${USHIFT_GITREF}"
else
MICROSHIFT_VERSION="$(awk -F'[=.-]' '{print $2 "." $3 "." $4}' Makefile.version.aarch64.var | sed -e 's/ //g')"
# After the X.Y.Z, add build timestamp for correct ordering of the RPMs based on the version.
MICROSHIFT_VERSION="${MICROSHIFT_VERSION}-$(date -u +%Y%m%d%H%M)"
fi
# Example results:
# - 4.21.0_ga9cd00b34_4.21.0_okd_scos.ec.5 for build against HEAD of main which was 4.21 at the time.
# - 4.21.0-202511271015-ga9cd00b34_4.21.0_okd_scos.ec.5 for build against HEAD of main which was 4.21 at the time.
# - 4.20.0-202510201126.p0-g1c4675ace_4.20.0-okd-scos.6 for build against a specific tag.
MICROSHIFT_VERSION="${MICROSHIFT_VERSION}-g${SOURCE_GIT_COMMIT}-${OKD_VERSION_TAG}"
# MicroShift's make-rpm.sh makes this substitution. Although we don't use the script,
Expand Down Expand Up @@ -80,4 +82,3 @@ if [[ "${target}" == "all" || "${target}" == "srpm" ]]; then
./packaging/rpm/make-rpm.sh srpm local
echo "${MICROSHIFT_VERSION}" > _output/rpmbuild/SRPMS/version.txt
fi

Loading