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

README.md: -DUSE_SYSTEM_BOOST=ON is the default now #102

Merged
merged 4 commits into from
May 12, 2020

Conversation

ermo
Copy link
Contributor

@ermo ermo commented May 9, 2020

Besides, -DSYSTEM_BOOST=ON was wrong. Two birds with one stone.

[skip ci]

ermo added 2 commits May 9, 2020 21:21
Besides, -DSYSTEM_BOOST=ON was wrong. Two birds with one stone.

[skip ci]
@nabaco
Copy link
Member

nabaco commented May 9, 2020

@BenjamenMeyer we might have an issue here, since [skip ci] tag is set, but GH is waiting for the CI to complete.
We need to change either the settings in GH to allow such merges, or the setting in Travis-CI to not run on README (or any .md) files.

@BenjamenMeyer
Copy link
Member

@nabaco there is a related bug...need to review this more as I was having issues with doing a build when solely following the build instructions in the readme, though vsbuild.sh works fine.

As to CI...will have to investigate more. Travis CI might wait for all potential builds to finish before sending the pass/fail to GH, even if some are marked as ignore/skip.

@BenjamenMeyer
Copy link
Member

ahh...reading more.. yeah seems GitHub doesn't recognize the skip ci tag in the commit history.
Personally I'd probably just let it go through the CI process regardless.

@nabaco well, we have a choice: either request the skip ci tag be removed, or do an administrative merge. We'll have to decide on a policy for that.

@ermo can you please update against master? That might in itself resolve the issue.

Copy link
Contributor

@stephengtuggy stephengtuggy left a comment

Choose a reason for hiding this comment

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

Approved. Can this be merged?

@BenjamenMeyer BenjamenMeyer merged commit 374316f into vegastrike:master May 12, 2020
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