Skip to content

[8.18] Surface failures from nested rake/shell tasks (backport #17310)#17314

Merged
andsel merged 3 commits into8.18from
mergify/bp/8.18/pr-17310
Mar 14, 2025
Merged

[8.18] Surface failures from nested rake/shell tasks (backport #17310)#17314
andsel merged 3 commits into8.18from
mergify/bp/8.18/pr-17310

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Mar 13, 2025

Release notes

[rn:skip]

What does this PR do?

Previously when rake would shell out the output would be lost. This made debugging CI logs difficult. This commit updates the stack with improved message surfacing on error.

Additionally this commit backports a change #16660 to allow linting specific files as it was originally missed and modifies the same method signature as we update in this backport.
'

Why is it important/What is the impact to the user?

N/A

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files (and/or docker env variables)
  • [ ] I have added tests that prove my fix is effective or that my feature works

Related issues

Logs


This is an automatic backport of pull request #17310 done by [Mergify](https://mergify.com).

Previously when rake would shell out the output would be lost. This
made debugging CI logs difficult. This commit updates the stack with
improved message surfacing on error.

(cherry picked from commit 0d931a5)

# Conflicts:
#	rubyUtils.gradle
@mergify mergify bot added backport conflicts Detected git conflicts labels Mar 13, 2025
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Mar 13, 2025

Cherry-pick of 0d931a5 has failed:

On branch mergify/bp/8.18/pr-17310
Your branch is up to date with 'origin/8.18'.

You are currently cherry-picking commit 0d931a50.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   rakelib/artifacts.rake

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rubyUtils.gradle

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

This commit extends the gradle and rake tasks to pass through a list of files
for rubocop to lint. This allows more specificity and fine grained control for
linting when the consumer of the tasks only wishes to lint a select few files.
Without this depending on task load order `Shellwords` may not be available.
@elastic-sonarqube
Copy link
Copy Markdown

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@elasticmachine
Copy link
Copy Markdown

💚 Build Succeeded

History

cc @donoghuc

Copy link
Copy Markdown
Member

@andsel andsel left a comment

Choose a reason for hiding this comment

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

LGTM

@andsel andsel merged commit 5299488 into 8.18 Mar 14, 2025
7 checks passed
@andsel andsel deleted the mergify/bp/8.18/pr-17310 branch March 14, 2025 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts Detected git conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants