8000 [merge to master] Emergency cherry-picks to fix documentation build in master by mloskot · Pull Request #394 · boostorg/gil · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[merge to master] Emergency cherry-picks to fix documentation build in master #394

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Sep 30, 2019
Merged

[merge to master] Emergency cherry-picks to fix documentation build in master #394

merged 4 commits into from
Sep 30, 2019

Conversation

mloskot
Copy link
Member
@mloskot mloskot commented Sep 26, 2019 •
edited
Loading

WARNING: This PR targets the MASTER branch

Description

This is a minimal fix cherry-picking of two essentuak commits from the develop branch into master branch in order to fix the documentation building issue leading to missing GIL docs from 1.70 and 1.71 releases:

  • 4ed7701 (excluding test/core/color_base present in develop only)
  • 628bfc2

See #351 (comment) and earlier comments there for detailed discussion.

Additionally, two auxiliary commits have been cherry-picked here, 99f8138 and d0cb17a, in order to update Travis CI configuration and keep our Travis CI builds green for master.

References

Tasklist

@mloskot mloskot added this to the Boost 1.72 milestone Sep 26, 2019
@mloskot mloskot added cat/bug But reports and bug fixes cat/documentation labels Sep 26, 2019
@mloskot
Move tests of extensions inside test/ directory (boostorg#302)
96df544 
Split header tests accordingly i.e. test core headers as part of
core tests, numeric extension headers as part of numeric tests, etc.

It extends the convention of sub-directories already established in
`include/boost/gil` directory. It is sensible to follow it in other
areas of the source tree (i.e. `test/`, `doc/` and `benchmark/`).

Another important reason to move the tests is to enable removal of
the top-level `Jamfile` with all its definitions of test-specific
requirements.
The top-level `Jamfile` is not advised, especially if it specifies
build requirements like C++ language version.
Those affect non-tests builds e.g. documentation, causing failures
during generation of HTML documentation (leads to missing docs).

(cherry picked from develop branch commit 4ed7701)
@mloskot
Add minimal top-level Jamfile to run test/ project
25b710d 
Related to boostorg#302

(cherry picked from develop branch commit 628bfc2)
@mloskot mloskot force-pushed the ml/emergency-master-fix-for-docs-build-bug-351 branch 2 times, most recently from b57132b to 25b710d Compare September 26, 2019 10:30
@mloskot
Copy link
Member Author
mloskot commented Sep 26, 2019 •
edited
Loading

Explanation for two job failing on Azure Pipeline

https://dev.azure.com/boostorg/gil/_build/results?buildId=683&view=logs

The AzP builds on Ubuntu are failing due outdated configuration and infrastructure with clashing Boost versions (old deployed and old system-wide). See details in PR #277.
Since we are not yet ready for full merge of develop to master and we don't want to cherry-pick too many commits here, we need to accept these two failing build jobs on AzP.

Conclusion

This branch is ready to be truly merged (no squashing please!).

@mloskot
[travis] Replace clang 5.0 with 6.0 for UBSAN builds [skip appveyor]
9512729 
[skip azp]

(cherry picked from develop branch commit 99f8138)
@mloskot
[travis] Remove llvm-toolchain-trusty-6.0 source [skip appveyor]
f2697e6 
Packages clang-6.0 (and 4.0 and 5.0) are available from Xenial's
default Apt package sources.

[skip azp]

(cherry picked from develop branch commit d0cb17a)
@mloskot mloskot requested review from stefanseefeld and removed request for stefanseefeld September 26, 2019 16:20
@mloskot
Copy link
Member Author
mloskot commented Sep 26, 2019 •
edited
Loading

@stefanseefeld This is PR ready to review.
This needs to be done ASAP, so if now objection arrives in a day or two, I will merge it as is.

8000

@mloskot
Copy link
Member Author
mloskot commented Sep 27, 2019

@stefanseefeld & @boostorg/gil-developers This is a heads up that I'm going to merge this soon

@mloskot
Copy link
Member Author
mloskot commented Sep 30, 2019 •
edited
Loading

I'm about to perform an intentional true merge of this PR into master branch, so this change sticks out in the history and can be inspected easily.

@mloskot mloskot merged commit 1d9fe2c into boostorg:master Sep 30, 2019
@mloskot mloskot deleted the ml/emergency-master-fix-for-docs-build-bug-351 branch September 30, 2019 17:34
@mloskot mloskot self-assigned this Sep 30, 2019
@mloskot mloskot modified the milestones: Boost 1.72, Boost 1.72+ Oct 23, 2019
mloskot added a commit to mloskot/gil that referenced this pull request Oct 30, 2019
@mloskot
[cmake] Rationalise names of tests vs targets
100b8e3 
Cherry-picked from develop branch commit 4dc3836
ignoring changes in all `CMakeLists.txt` files but this one
`test/extension/toolbox/CMakeLists.txt` which somehow missed the changes.
Possibly due to my mistake during previous cherry-picks to compose
the emergency fix boostorg#394 for docs in `master` branch, that also
brought the restructuring of the tests directories.

Missing changes in `test/extension/toolbox/CMakeLists.txt` file
are currently causing failures of AzP builds using CMake
for `master` Boost 1.72 merge e8a04f4
This is attempt to fix it in the `master`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stefanseefeld stefanseefeld Awaiting requested review from stefanseefeld

Assignees

@mloskot mloskot

Labels
cat/bug But reports and bug fixes cat/documentation
Projects
None yet
Milestone
Boost 1.72
Development

Successfully merging this pull request may close these issues.
1 participant
@mloskot
0