Skip to content

Conversation

Stoozy
Copy link

@Stoozy Stoozy commented Jul 19, 2025

See JENKINS-73837.

Testing done

A test was already created as a part of acceptance criteria #9809 and it is passing after the changes.

Other relevant existing tests (to my knowledge) have been modified to accept new behavior.

Proposed changelog category

/label rfe

Proposed upgrade guidelines

N/A

Submitter checklist

  • The Jira issue, if it exists, is well-described.
  • 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.
  • There is automated testing or an explanation as to why this change has no tests.
  • New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadocs, as appropriate.
  • New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO"), if applicable.
  • 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).
  • For dependency updates, there are links to external changelogs and, if possible, full differentials.
  • For new APIs and extension points, there is a link to at least one consumer.

Desired reviewers

@MarkEWaite

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

Maintainer checklist

  • There are at least two (2) approvals for the pull request and no outstanding requests for change.
  • Conversations in the pull request are over, or it is explicit that a reviewer is not blocking the change.
  • Changelog entries in the pull request title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood.
  • Proper changelog labels are set so that the changelog can be generated automatically.
  • 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).
  • 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).

Copy link

welcome bot commented Jul 19, 2025

Yay, your first pull request towards Jenkins core was created successfully! Thank you so much!

A contributor will provide feedback soon. Meanwhile, you can join the chats and community forums to connect with other Jenkins users, developers, and maintainers.

@comment-ops-bot comment-ops-bot bot added the rfe For changelog: Minor enhancement. use `major-rfe` for changes to be highlighted label Jul 19, 2025
@mawinter69
Copy link
Contributor

duplicate of #9836

@Stoozy
Copy link
Author

Stoozy commented Jul 20, 2025

duplicate of #9836

Should I close this then?

@mawinter69
Copy link
Contributor

As per comment #9836 (comment) the solution there is not fully working. As your change is more or less identical to what was done there you would need to check how the problems mentioned there could be solved. If you find a solution then go ahead, otherwise it might be better to close this one in favor of the other as it already contains longer discussions.
I don't know if the author @DerSimeon intends to keep working on that PR as the last comment there was over 6 months ago.

@Stoozy
Copy link
Author

Stoozy commented Jul 21, 2025

So I read the conversation and the problem seems to be inside ArtifactArchiver where the ListFiles invoke() method is using the DirectoryScanner from apache ant instead of the one modified to count empty directories (in hudson.util). My question is, should I modify the invoke method to count empty directories using the current scanner or somehow figure out a way to use the DirScanner from hudson.util?

@Stoozy
Copy link
Author

Stoozy commented Jul 25, 2025

Just a some updates on this, I've modified the archive options advanced tab to give a checkbox to archive empty directories. The boolean includeEmptyDirs inside ArtifactArchiver is kept and used by ListFiles to include empty directories when invoked. CopyRecursiveLocal will always handle directories now, so as long as the paths are filtered on a higher level (like in ArtifactArchiver) it should be fine handling both included and excluded scenarios. Any further guidance would be much appreciated.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rfe For changelog: Minor enhancement. use `major-rfe` for changes to be highlighted
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants