Skip to content
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.

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

Switch from hacky dist_suffix to release_suffix in RPMs #939

Merged
merged 1 commit into from
Feb 2, 2022

Conversation

cottsay
Copy link
Member

@cottsay cottsay commented Feb 2, 2022

This hack was used to suffix package versions with a timestamp before Bloom added support for the release_suffix macro in 0.9.2 (almost two years ago).

With this change, the build timestamps will no longer be added to packages which were released with bloom versions prior to 0.9.2.

This hack is no longer working correctly after we switched to AlmaLinux for the underlying mock configuration. The AlmaLinux config appends .alma to config['dist'], which this hack (incorrectly) assumes will contain the default value for the %dist macro in the RPM build.

Follow-up to #938
Related to ros-infrastructure/bloom#569

This hack was used to suffix package versions with a timestamp before
Bloom added support for the `release_suffix` macro in 0.9.2 (almost two
years ago).

With this change, the build timestamps will no longer be added to
packages which were released with bloom versions prior to 0.9.2.
@cottsay cottsay self-assigned this Feb 2, 2022
@nuclearsandwich
Copy link
Contributor

With this change, the build timestamps will no longer be added to packages which were released with bloom versions prior to 0.9.2.

Hard to believe that 0.9.2 was already|only two years ago. Since both Galactic and Rolling were created with later versions of bloom, Galactic documented as using a modified 0.10.71 and Rolling in June 2020, presumably with 0.9.7 from May 2020, although the bloom version was not recorded2. This limitation doesn't concern me.

@cottsay
Copy link
Member Author

cottsay commented Feb 2, 2022

The CI logs for this PR shows that the following package was produced by the ROS 2 Release (RPM) check: ros-rolling-rcutils-5.0.1-1.el8.20220202.230419.x86_64.rpm

  • Still has a build stamp
  • No longer has .alma in the package release version

@cottsay cottsay merged commit 8ab353c into master Feb 2, 2022
@cottsay cottsay deleted the cottsay/drop-suffix-hack branch February 2, 2022 23:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants