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

golang: include go.env in GOROOT #8021

Merged
merged 1 commit into from
Feb 23, 2024
Merged

Conversation

mfrw
Copy link
Member

@mfrw mfrw commented Feb 22, 2024

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

What does the PR accomplish, why was it needed?
Include go.env in GOROOT which is now the default value from where GOPROXY value is read

Cherry-Pick of: #8004

Change Log
  • Include go.env in GOROOT
Does this affect the toolchain?

NO

Associated issues
Links to CVEs
  • NA
Test Methodology

/cc @dagood

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
@mfrw mfrw added the 3.0-dev PRs Destined for AzureLinux 3.0 label Feb 22, 2024
@mfrw mfrw marked this pull request as ready for review February 22, 2024 09:40
@mfrw mfrw requested a review from a team as a code owner February 22, 2024 09:40
Copy link
Contributor

@kanikanema kanikanema left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@dagood dagood left a comment

Choose a reason for hiding this comment

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

This also sets GOTOOLCHAIN=local, which is important for Mariner to avoid accidentally downloading "official" Go builds in CI: https://github.com/microsoft/go/blob/v1.21.6-1/patches/0008-Update-default-go.env.patch

/cc @qmuntal @gdams

@mfrw mfrw merged commit eb81d4d into 3.0-dev Feb 23, 2024
10 checks passed
@mfrw mfrw deleted the mfrw/3.0-golang-include-go.env branch February 23, 2024 02:30
Xiaohong-Deng pushed a commit to Xiaohong-Deng/azurelinux that referenced this pull request Nov 23, 2024
Reference: golang/go#61928
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3.0-dev PRs Destined for AzureLinux 3.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants