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

Edit tasklist title
Beta Give feedback Tasklist Submitter checklist, more options

Delete tasklist

Delete tasklist block?
Are you sure? All relationships in this tasklist will be removed.
  1. The Jira issue, if it exists, is well-described.
    Options
  2. The changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developers, depending on the change) and are in the imperative mood (see examples). Fill in the Proposed upgrade guidelines section only if there are breaking changes or changes that may require extra steps from users during upgrade.
    Options
  3. There is automated testing or an explanation as to why this change has no tests.
    Options
  4. New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadocs, as appropriate.
    Options
  5. New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO"), if applicable.
    Options
  6. New or substantially changed JavaScript is not defined inline and does not call eval to ease future introduction of Content Security Policy (CSP) directives (see documentation).
    Options
  7. For dependency updates, there are links to external changelogs and, if possible, full differentials.
    Options
  8. For new APIs and extension points, there is a link to at least one consumer.
    Options

Desired reviewers

@mention

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

Maintainer checklist

Edit tasklist title
Beta Give feedback Tasklist Maintainer checklist, more options

Delete tasklist

Delete tasklist block?
Are you sure? All relationships in this tasklist will be removed.
  1. There are at least two (2) approvals for the pull request and no outstanding requests for change.
    Options
  2. Conversations in the pull request are over, or it is explicit that a reviewer is not blocking the change.
    Options
  3. Changelog entries in the pull request title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood.
    Options
  4. Proper changelog labels are set so that the changelog can be generated automatically.
    Options
  5. If the change needs additional upgrade steps from users, the upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the pull request title (see example).
    Options
  6. If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).
    Options

@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
4 participants