Skip to content

Conversation

PawelWMS
Copy link
Contributor

@PawelWMS PawelWMS commented Mar 18, 2022

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/tools/cgmanifest.json, ./toolkit/scripts/toolchain/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

While working on #2515, @mfrw noticed that we're building the 1.1.1g version of openssl in the 1st phase of the toolchain builds, while in general Mariner is on the 1.1.1k version. This PR makes the built versions consistent.

Change Log
  • Made sure we build the 1.1.1k version of openssl consistently across toolchain build phases.
Does this affect the toolchain?

Yes.

Associated issues
Test Methodology
  • Pipeline toolchain build: 175989

@PawelWMS PawelWMS requested a review from a team as a code owner March 18, 2022 21:17
@ghost ghost added Tools main PR Destined for main labels Mar 18, 2022
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

LGTM, just one request!

Copy link
Member

@mfrw mfrw left a comment

Choose a reason for hiding this comment

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

LGTM :)

@PawelWMS PawelWMS merged commit e46fc8a into microsoft:main Mar 23, 2022
@PawelWMS PawelWMS deleted the pawelwi/align_openssl_versions branch March 23, 2022 19:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

main PR Destined for main Tools

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants