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

[JENKINS-73168] Restore 'No changes' label when there are no changes in a build #9283

Merged
merged 1 commit into from
May 19, 2024

Conversation

janfaracik
Copy link
Contributor

@janfaracik janfaracik commented May 17, 2024

See JENKINS-73168.

Will need some input on this, unsure if this is the right approach.

core/src/main/resources/hudson/model/AbstractBuild/changes.jelly uses ${it.changeSet} to load change sets, which returns an EmptyChangeLogSet when there are none. core/src/main/resources/jenkins/scm/RunWithSCM/changesets.jelly on the other hand uses ${it.changeSets} which returns an empty list. As a rather rudimentary fix I'm injecting the EmptyChangeLogSet digest.jelly when the list is empty - which works, albeit I'm not sure if these two files should be unified in their approach to loading change sets.

Testing done

  • No changes label appears when there are no changes

Proposed changelog entries

  • Restore 'No changes' label when there are no changes in a build. Regression in 2.453.

Proposed upgrade guidelines

N/A

Submitter checklist

Desired reviewers

@mention

Before the changes are marked as ready-for-merge:

Maintainer checklist

@MarkEWaite MarkEWaite added the bug For changelog: Minor bug. Will be listed after features label May 17, 2024
Copy link
Member

@NotMyFault NotMyFault left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@NotMyFault NotMyFault requested a review from a team May 18, 2024 14:33
@MarkEWaite
Copy link
Contributor

This PR is now ready for merge. We will merge it after approximately 24 hours if there is no negative feedback.

/label ready-for-merge

@comment-ops-bot comment-ops-bot bot added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label May 18, 2024
@MarkEWaite MarkEWaite self-assigned this May 18, 2024
@MarkEWaite MarkEWaite merged commit 7f44636 into jenkinsci:master May 19, 2024
16 checks passed
@janfaracik janfaracik deleted the JENKINS-73168 branch May 19, 2024 14:13
@basil
Copy link
Member

basil commented May 21, 2024

Per JENKINS-73168 (comment):

As part of fixing this issue, the workaround in acceptance-test-harness should be removed per jenkinsci/acceptance-test-harness#1548, and the core pull request should ensure that FreestyleJobTest#should_visit_build_with_permalink is passing with the workaround removed.

@MarkEWaite
Copy link
Contributor

MarkEWaite commented May 21, 2024

Per JENKINS-73168 (comment):

As part of fixing this issue, the workaround in acceptance-test-harness should be removed per jenkinsci/acceptance-test-harness#1548, and the core pull request should ensure that FreestyleJobTest#should_visit_build_with_permalink is passing with the workaround removed.

Thanks for the reminder. Let me take that one as part of completing the weekly release.

Submitted:

krisstern pushed a commit to krisstern/jenkins that referenced this pull request May 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug For changelog: Minor bug. Will be listed after features ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants