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

provide sqlite2cpp as well #1786

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

vpoinot
Copy link

@vpoinot vpoinot commented Nov 15, 2024

The script sqlite2cpp works better than ddl2cpp when it comes to sqlite3 schemas. Provide it as well.

@jpakkane
Copy link
Member

You need to add the package to releases.json.

@vpoinot
Copy link
Author

vpoinot commented Nov 19, 2024

@jpakkane
Copy link
Member

It is not. You need to add a new entry in the version list as well. "0.64-2"

@vpoinot
Copy link
Author

vpoinot commented Nov 21, 2024

It is not. You need to add a new entry in the version list as well. "0.64-2"

Done: https://github.com/mesonbuild/wrapdb/pull/1786/files#diff-f71e67b61c52ecd942c6d915f8ff111cb57052fe82992eda958b87a9c62ed633R3473

Let me know if something else is needed.

@@ -1,6 +1,7 @@
project('sqlpp11', 'cpp', version: '0.64', license: 'BSD-2-Clause')

meson.override_find_program('ddl2cpp', files('scripts/ddl2cpp'))
meson.override_find_program('ddl2cpp', find_program('scripts/ddl2cpp'))
meson.override_find_program('sqlite2cpp', find_program('scripts/sqlite2cpp.py'))
Copy link
Author

@vpoinot vpoinot Nov 21, 2024

Choose a reason for hiding this comment

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

This change is based on this comment: mesonbuild/meson#13907 (comment)

@vpoinot
Copy link
Author

vpoinot commented Nov 22, 2024

The sanity checks fail on macos, because of some missing dependency (mariadb). Is this something expected?

@jpakkane
Copy link
Member

Maybe brew has changed their packaging somehow? I don't use macOS, so not really sure how to debug that. If nothing else then the flag should be removed from ci_config.json.

@eli-schwartz
Copy link
Member

wrapdb/ci_config.json

Lines 1076 to 1085 in 4972deb

"sqlitecpp": {
"_comment": "required to not use the default sqlite3 in MacOS to avoid compilation errors/tests failures, also add pkgconfig path to find sqlite3(keg-only)",
"build_options": [
"sqlitecpp:SQLITECPP_BUILD_TESTS=true",
"sqlitecpp:SQLITECPP_BUILD_EXAMPLES=true",
"pkg_config_path=/usr/local/opt/sqlite/lib/pkgconfig"
],
"brew_packages": [
"sqlite"
]

If mariadb is mandatory for the wrapdb CI e.g. in order to run all tests, then please install it in the ci config. It's possible this wasn't necessary in the past because GitHub chose to install it by default -- they sometimes remove packages that most people don't use in order to decrease VM sizes for their hosted runners. IIRC they have done one of those cleanups recently.

Copy link
Member

@eli-schwartz eli-schwartz left a comment

Choose a reason for hiding this comment

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

Please use git commit --fixup=sha1 && git rebase -i --autosquash when fixing issues introduced in a previous commit in the same PR.

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.

3 participants