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.

Sign up for GitHub

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

Jump to bottom

Fix NOTICE.txt line endings #6911

Merged
merged 2 commits into from
Feb 18, 2025
Merged

Fix NOTICE.txt line endings #6911

merged 2 commits into from
Feb 18, 2025

Conversation

intxgo
Copy link
Contributor

@intxgo intxgo commented Feb 18, 2025

What does this PR do?

The NOTICE.txt contains mixed line endings, as produced by mage notice command. This PR adds equivalent of dos2unix NOTICE.txt to the generator to fix this.

Why is it important?

  1. The file is inconsistent to view, whether on unix or windows.
  2. The command mage notice produces incompatible NOTICE.txt changes on windows, which cannot then be fixed by dos2unix, etc, because the CI keeps producing file with mixed line endings.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • 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
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in ./changelog/fragments using the changelog tool
  • I have added an integration test or an E2E test

Disruptive User Impact

How to test this PR locally

Related issues

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...

@intxgo intxgo added the Cleanup label Feb 18, 2025
@intxgo intxgo requested a review from a team as a code owner February 18, 2025 12:08
@mergify mergify bot assigned intxgo Feb 18, 2025
@mergify Mergify
Copy link
Contributor

mergify bot commented Feb 18, 2025

This pull request does not have a backport label. Could you fix it @intxgo? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-./d./d is the label that automatically backports to the 8./d branch. /d is the digit
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

@swiatekm swiatekm added skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team labels Feb 18, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

pkoutsovasilis
pkoutsovasilis reviewed Feb 18, 2025
View reviewed changes
Copy link
Contributor

@pkoutsovasilis pkoutsovasilis left a comment

Choose a reason for hiding this comment

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

The code changes make sense to me and I am surprised how we managed all this time to not run into this with mixed line endings in the NOTICE.txt thanks for the fix @intxgo . My LGTM will come when CI is green 🙂

@elastic-sonarqube Elastic SonarQube
Copy link

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

@intxgo intxgo merged commit 467ece4 into elastic:main Feb 18, 2025
16 of 18 checks passed
@intxgo intxgo deleted the fix-NOTICE branch February 18, 2025 22:52
khushijain21 pushed a commit to khushijain21/elastic-agent that referenced this pull request Feb 19, 2025
@intxgo @khushijain21
Fix NOTICE.txt line endings (elastic#6911)
34ea614 
* dos2unix NOTICE.txt

* add dos2unix step to notice generator
@cmacknz cmacknz added the backport-8.x Automated backport to the 8.x branch with mergify label Feb 19, 2025
mergify bot pushed a commit that referenced this pull request Feb 19, 2025
@intxgo @mergify
Fix NOTICE.txt line endings (#6911)
732be01 
* dos2unix NOTICE.txt

* add dos2unix step to notice generator

(cherry picked from commit 467ece4)
@mergify mergify bot mentioned this pull request Feb 19, 2025
Merged
8 tasks
pierrehilbert pushed a commit that referenced this pull request Feb 21, 2025
@mergify @intxgo
Fix NOTICE.txt line endings (#6911) (#6934)
804a3e1 
* dos2unix NOTICE.txt

* add dos2unix step to notice generator

(cherry picked from commit 467ece4)

Co-authored-by: Leszek Kubik <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pkoutsovasilis pkoutsovasilis pkoutsovasilis approved these changes

@michalpristas michalpristas Awaiting requested review from michalpristas michalpristas is a code owner automatically assigned from elastic/elastic-agent-control-plane

@andrzej-stencel andrzej-stencel Awaiting requested review from andrzej-stencel andrzej-stencel is a code owner automatically assigned from elastic/elastic-agent-control-plane

Assignees

@intxgo intxgo

Labels
backport-8.x Automated backport to the 8.x branch with mergify Cleanup skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@intxgo @elasticmachine @pkoutsovasilis @cmacknz @swiatekm