Make more-licenses.md deterministic by removing generated timestamp noise - #4802
Merged
rajkumar-rangaraj merged 8 commits intoJul 31, 2026
Merged
Conversation
Co-authored-by: xiang17 <9310587+xiang17@users.noreply.github.com>
Co-authored-by: xiang17 <9310587+xiang17@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix license report generation to avoid merge conflicts
Make Jul 30, 2026
more-licenses.md deterministic by removing generated timestamp noise
xiang17
marked this pull request as ready for review
July 30, 2026 23:02
xiang17
requested review from
harsimar,
mattsains-msft,
rajkumar-rangaraj,
ramthi and
trask
as code owners
July 30, 2026 23:02
…is changed. Previously it was expecting a timestamp change.
rajkumar-rangaraj
approved these changes
Jul 31, 2026
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
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.
Context
Merging PRs such as #4781 causes other pending PRs to almost certainly have a conflict in
more-licenses.md's 4th line, which is an auto-generated timestamp, for example: Bump com.github.jk1.dependency-license-report from 3.1.2 to 3.1.4 #4746, Bump com.github.oshi:oshi-core from 7.2.1 to 7.4.2 #4743 and Bump the opentelemetry group across 1 directory with 8 updates #4767.gradle.lockfiles where changed versions are neighbors, for example: Bump the opentelemetry group across 1 directory with 8 updates #4767.Copilot
licenses/more-licenses.mdwas non-deterministic becausegenerateLicenseReportinjected a per-run timestamp, creating guaranteed merge conflicts across concurrent dependency PRs with no semantic content differences. This change removes that source of churn and simplifies the PR-helper logic that previously special-cased it.Deterministic license report output
generateLicenseReportpost-processing step inagent/agent/build.gradle.ktsthat removes only the timestamp line matching_YYYY-MM-DD HH:MM:SS UTC_immediately after## Dependency License Report.Workflow cleanup
.github/workflows/pull-request-helper.yml(“Update license report” step) by removing the--shortstattimestamp heuristic.git add licensesgit diff --cached --quiet→ no-op if unchanged, commit otherwiseRegenerated committed artifact
licenses/more-licenses.mdto reflect deterministic output (timestamp line removed, dependency/license content unchanged).