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

Bump mysql integration CI to 8.3 #1508

Merged
merged 2 commits into from
Apr 15, 2024
Merged

Conversation

samuel40791765
Copy link
Contributor

@samuel40791765 samuel40791765 commented Mar 22, 2024

Issues:

Resolves V1073444663

Description of changes:

MySQL 8.2/8.3 changed some of the build behavior with OpenSSL. According to the documentation, -DWITH_SSL={path_name} is a viable option, but it only seems to work with Visual Studio and MacOS due to the usage of ${CMAKE_CFG_INTDIR}. ${CMAKE_CFG_INTDIR} is undefined on single build configs like regular Make and Ninja, so our build fails when using the option.

Another option was documented in the link above:

Another permitted way to do the same thing is to set WITH_SSL to system and set the CMAKE_PREFIX_PATH option to path_name.)

Using this gets around our issues. This PR is still pending the merge of #1496 and #1504 before the CI can pass.

Call-outs:

N/A

Testing:

CI update

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.

@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 76.98%. Comparing base (5ede432) to head (67a10b3).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1508      +/-   ##
==========================================
- Coverage   77.00%   76.98%   -0.03%     
==========================================
  Files         425      425              
  Lines       71556    71556              
==========================================
- Hits        55103    55087      -16     
- Misses      16453    16469      +16     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@@ -45,7 +46,7 @@ function mysql_patch_reminder() {
}

function mysql_build() {
cmake ${MYSQL_SRC_FOLDER} -GNinja -DWITH_BOOST=${BOOST_INSTALL_FOLDER} -DWITH_SSL=${AWS_LC_INSTALL_FOLDER} "-B${MYSQL_BUILD_FOLDER}" -DCMAKE_BUILD_TYPE=RelWithDebInfo
cmake ${MYSQL_SRC_FOLDER} -GNinja -DWITH_SSL=system -DCMAKE_PREFIX_PATH=${AWS_LC_INSTALL_FOLDER} "-B${MYSQL_BUILD_FOLDER}" -DCMAKE_BUILD_TYPE=RelWithDebInfo
time ninja -C ${MYSQL_BUILD_FOLDER}
ls -R ${MYSQL_BUILD_FOLDER}
}
Copy link
Contributor

Choose a reason for hiding this comment

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

can we add a ldd ... | grep $AWS_LC_INSTALL_FOLDER/lib/libssl.so check to assert that mysql is properly built against AWS_LC?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, just added

justsmth
justsmth previously approved these changes Apr 15, 2024
@samuel40791765 samuel40791765 merged commit 4566f1d into aws:main Apr 15, 2024
46 checks passed
@samuel40791765 samuel40791765 deleted the mysql-8.3 branch April 15, 2024 21:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants