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

Use a common Makefile, Build automation #92

Merged
merged 4 commits into from
Mar 11, 2024

Conversation

rwk-unil
Copy link
Contributor

Hello Olivier, Simone,

Here is a pull request for 4 patches to SHAPEIT5. They do the following :

  1. Use a common Makefile, located in the common directory and include it instead of duplicating the Makefiles.
  2. Clean this common Makefile so that it works with the instructions given in the SHAPEIT5 documentation (e.g., default HTSLIB path).
  3. Add an automated build workflow to check if SHAPEIT5 (and XCFTools) build when new changes are pushed to the main branch
  4. Add build badges on the main README, they show if the build is passing and if the documentation pages are generated.

After this pull request, it would be nice to update the XCFTools submodule to the version of XCFTools after my pull request on XCFTools, all builds should pass.

Best regards,
Rick

The makefiles were exact duplicates, use a common makefile.
Add a common makefile in the common directory and include
it in the other makefiles.

Signed-off-by: Rick Wertenbroek <[email protected]>
Compile with the static .a libraries only when compiling the static
exe. Search for the .a static libraries in system automatically and
warn if they are not found. Clean the rules to use the library
paths found. Add dynamic libraries for boost and htslib when
linking the normal exe (the non static one).

Signed-off-by: Rick Wertenbroek <[email protected]>
This is a script for automated build of SHAPEIT5 and XCFTools on a GitHub
runner. It will run on Ubuntu 20.04, download all dependencies, clone the
SHAPEIT5 repository, init submodules, build SHAPEIT5 and XCFTools.

Signed-off-by: Rick Wertenbroek <[email protected]>
Add a build badge on the main README to show if the project builds
Add a build badge to to show if the documentation pages build

Signed-off-by: Rick Wertenbroek <[email protected]>
@rwk-unil
Copy link
Contributor Author

rwk-unil commented Mar 11, 2024

The Build system shows a failure to build XCFTools, this is normal, it is because the XCFTools changes have not yet been merged and the submodule was not yet updated in SHAPEIT5. (The old XCFTools makefile is missing the -lcurl flag).

@srubinacci srubinacci merged commit 896fff6 into odelaneau:main Mar 11, 2024
1 check failed
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.

2 participants