Skip to content

Include modules with windows,darwin,linux build tags when generating NOTICE files#5002

Merged
ycombinator merged 3 commits intoelastic:mainfrom
ycombinator:update-notice-files
Jun 3, 2025
Merged

Include modules with windows,darwin,linux build tags when generating NOTICE files#5002
ycombinator merged 3 commits intoelastic:mainfrom
ycombinator:update-notice-files

Conversation

@ycombinator
Copy link
Copy Markdown
Contributor

@ycombinator ycombinator commented Jun 3, 2025

This PR fixes the NOTICE generation code to always include Go modules that use the windows,linux, and darwin build tags.

@ycombinator ycombinator requested a review from a team as a code owner June 3, 2025 17:05
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jun 3, 2025

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

  • backport-./d./d is the label to automatically backport 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.

michel-laterman
michel-laterman previously approved these changes Jun 3, 2025
@ycombinator ycombinator enabled auto-merge (squash) June 3, 2025 17:08
@ycombinator ycombinator added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team backport-8.19 Automated backport to the 8.19 branch skip-changelog labels Jun 3, 2025
@ycombinator
Copy link
Copy Markdown
Contributor Author

Trying to figure out why check-ci is failing in CI.

Calling the mage check:ci target passes locally:

$ mage check:ci
$ echo $?
0
$ git status
On branch update-notice-files
nothing to commit, working tree clean

Calling check_ci.sh that calls mage check:ci also passes locally:

$ ./.buildkite/scripts/check_ci.sh
Adding PATH to the environment variables...
Setting up the Go environment...
ERROR: Unrecognized command line argument: '1.24.3'
go version go1.24.3 darwin/arm64
/Users/shaunak/.gvm/gos/go1.24.3/bin/go
/Users/shaunak/.magefile cleaned
Mage Build Tool <not set>
Build Date: <not set>
Commit: <not set>
built with: go1.24.3
/Users/shaunak/.gvm/pkgsets/go1.24.3/global/bin/mage
$ echo $?
0

@michel-laterman @v1v can you spot something I'm not seeing?

@ycombinator ycombinator requested a review from v1v June 3, 2025 18:37
@ycombinator ycombinator force-pushed the update-notice-files branch from d2c6be4 to f60417b Compare June 3, 2025 18:40
@prodsecmachine
Copy link
Copy Markdown

prodsecmachine commented Jun 3, 2025

🎉 Snyk checks have passed. No issues have been found so far.

security/snyk check is complete. No issues have been found. (View Details)

license/snyk check is complete. No issues have been found. (View Details)

@ycombinator ycombinator changed the title Update NOTICE.txt and NOTICE-FIPS.txt files Include modules with windows,darwin,linux build tags when generating NOTICE files Jun 3, 2025
@ycombinator
Copy link
Copy Markdown
Contributor Author

Chatting off-PR with @michel-laterman, he mentioned:

I had an issue where on my macbook the notice files it generates didn't match whata buildkite made
in order to get around it i ran the command in a vm

That got me wondering if we're not considering modules for all OSs (via their build tags) when generating NOTICE files. That was indeed the case and I've fixed it in 826158f.

michel-laterman
michel-laterman previously approved these changes Jun 3, 2025
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jun 3, 2025

This pull request is now in conflicts. Could you fix it @ycombinator? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b update-notice-files upstream/update-notice-files
git merge upstream/main
git push upstream update-notice-files

@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

@ycombinator ycombinator merged commit 8659e76 into elastic:main Jun 3, 2025
9 checks passed
mergify bot pushed a commit that referenced this pull request Jun 3, 2025
(cherry picked from commit 8659e76)

# Conflicts:
#	NOTICE-fips.txt
#	NOTICE.txt
ycombinator added a commit that referenced this pull request Jun 3, 2025
…` build tags when generating NOTICE files (#5006)

* Update NOTICE files (#5002)

(cherry picked from commit 8659e76)

# Conflicts:
#	NOTICE-fips.txt
#	NOTICE.txt

* Regenerating NOTICE files

---------

Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-8.19 Automated backport to the 8.19 branch skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants