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

qbs: add docs #3806

Merged
merged 2 commits into from
Aug 13, 2024
Merged

qbs: add docs #3806

merged 2 commits into from
Aug 13, 2024

Conversation

ABBAPOH
Copy link
Contributor

@ABBAPOH ABBAPOH commented Aug 3, 2024

No description provided.

@CLAassistant
Copy link

CLAassistant commented Aug 3, 2024

CLA assistant check
All committers have signed the CLA.

@ABBAPOH
Copy link
Contributor Author

ABBAPOH commented Aug 10, 2024

Can we merge this?

Copy link
Member

@memsharded memsharded left a comment

Choose a reason for hiding this comment

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

Looks good to me, thanks for your contribution!

If you want to have it immediately published, you can target the latest release/2.6 branch instead of develop2, then it will go live without having to wait until the next release (develop2 is the default for new features to be in the next release)

reference/tools/qbs/qbsdeps.rst Outdated Show resolved Hide resolved
@memsharded memsharded added this to the 2.6.0 milestone Aug 11, 2024
@ABBAPOH ABBAPOH changed the base branch from develop2 to release/2.6 August 12, 2024 10:51
@ABBAPOH
Copy link
Contributor Author

ABBAPOH commented Aug 12, 2024

Do I need to rebase or Github will handle the branch change?

@AbrilRBS
Copy link
Member

AbrilRBS commented Aug 12, 2024

Do I need to rebase or Github will handle the branch change?

It's ok, the two branches have not diverged yet so merging in 2.6 does not require extra changes on your part :)

The CI is currently failing with

Warning, treated as error:

conan/tools/qbs/qbs.py:docstring of conan.tools.qbs.qbs.Qbs:6:Field list ends without a blank line; unexpected unindent.```

@ABBAPOH
Copy link
Contributor Author

ABBAPOH commented Aug 12, 2024

Apparently, conan-io/conan@369a3d0 is not in 2.6 branch

@ABBAPOH
Copy link
Contributor Author

ABBAPOH commented Aug 13, 2024

Can I cherry-pick to 2.6 conan-io/conan#16821 ?

@czoido czoido merged commit 82c3103 into conan-io:release/2.6 Aug 13, 2024
2 checks passed
@czoido
Copy link
Contributor

czoido commented Aug 13, 2024

@ABBAPOH thanks for the contribution, it will be published in a couple of minutes when the ci job ends.

@ABBAPOH ABBAPOH deleted the qbs branch August 13, 2024 20:28
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.

5 participants