Avoid depending on the value of the --stamp flag if possible#1035
Merged
Conversation
cgrindel
approved these changes
Mar 1, 2026
Collaborator
|
I won't merge this PR yet so that @aiuto can take a look. |
aiuto
approved these changes
Mar 7, 2026
Collaborator
aiuto
left a comment
aiuto
left a comment
There was a problem hiding this comment.
Sorry for the delay.
This is a subtle one, but I see what you're doing now.
wade-arista
added a commit
to wade-arista/rules_pkg
that referenced
this pull request
Mar 10, 2026
- Add docstring to get_status_vars() in build_info.py - Use get_stamp_detect() from util.bzl instead of inline select() to match the pattern from PR bazelbuild#1035 - Expand release attr docstring to document stamp variable substitution - Add stamped RPM example to examples/rpm/system_rpmbuild_pfg
rdesgroppes
added a commit
to DataDog/datadog-agent
that referenced
this pull request
Mar 20, 2026
What does this PR do? bump rules_pkg to Mar 17 main, picking up: - bazelbuild/rules_pkg#1024: RPM build errors would go unnoticed without it - bazelbuild/rules_pkg#1035: affects reproducibiliy of builds - bazelbuild/rules_pkg#1044 - bazelbuild/rules_pkg#1046: a contribution of ours (@chouquette) - bazelbuild/rules_pkg#1047: we might need this
gh-worker-dd-mergequeue-cf854d Bot
pushed a commit
to DataDog/datadog-agent
that referenced
this pull request
Mar 20, 2026
### What does this PR do? Bump `rules_pkg` to current `main`. ### Motivation Pick up: - bazelbuild/rules_pkg#1021: a contribution of ours - bazelbuild/rules_pkg#1024: RPM build errors would go unnoticed without it - bazelbuild/rules_pkg#1035: affects reproducibiliy of builds - bazelbuild/rules_pkg#1044 - bazelbuild/rules_pkg#1046: another contribution of ours (@chouquette) - bazelbuild/rules_pkg#1047: we might need this feature Co-authored-by: regis.desgroppes <regis.desgroppes@datadoghq.com>
aiuto
pushed a commit
that referenced
this pull request
Apr 9, 2026
* feat: add stamp support for pkg_rpm Release tag
Allow `{VARIABLE_NAME}` placeholders in the `release` attribute of
`pkg_rpm`. When `stamp = 1` (or `stamp = -1` with `--stamp`), workspace
status variables from volatile-status.txt are substituted at build time.
- Add `get_status_vars()` to `pkg/private/build_info.py`
- Add `--volatile_status_file` and `--stable_status_file` args to
`make_rpm.py`; apply substitution in `RpmBuilder.__init__` via the
new `stamp_vars` parameter
- Add `stamp` and `private_stamp_detect` attrs to the `pkg_rpm` rule;
rename the rule to `_pkg_rpm_rule` and expose a `pkg_rpm` macro that
injects `private_stamp_detect` via `select()`, matching the pattern
used by `pkg_tar` and `pkg_zip`
- Avoid embedding template placeholders in the output filename when stamp
is active
Fixes #1038
* clean up uses of str.strip() in build_info.py
We don't need to call it multiple times on the same line value, we can
just call it once and save it.
* Address PR #1039 review feedback
- Add docstring to get_status_vars() in build_info.py
- Use get_stamp_detect() from util.bzl instead of inline select()
to match the pattern from PR #1035
- Expand release attr docstring to document stamp variable substitution
- Add stamped RPM example to examples/rpm/system_rpmbuild_pfg
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
pkg_tarandpkg_zipuse aconfig_settingto read the value of the--stampbuild option. This is suboptimal for some new Google-internal caching features. We can restrict this dependency to cases wherestamp = -1on the rule level. The default rule-level attribute isstamp = 0, so this removes the dependency by default.