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

update osg-qt from Qt4 tag to master branch(Qt5) #14761

Merged
merged 8 commits into from
Apr 29, 2021
Merged

update osg-qt from Qt4 tag to master branch(Qt5) #14761

merged 8 commits into from
Apr 29, 2021

Conversation

ZgblKylin
Copy link
Contributor

Describe the pull request

  • What does this PR do?

    • Remove unused dependency of protobuf.

    • Update repo from tag Qt4 to latest master commit (Qt5 version).

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    • Support all triplets for previous version.
  • Does your PR follow the maintainer guide?

    • Yes

@JackBoosY
Copy link
Contributor

cc @Neumann-A for review this PR.

@JackBoosY JackBoosY added category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist category:port-update The issue is with a library, which is requesting update new revision and removed category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist labels Nov 26, 2020
@ZgblKylin
Copy link
Contributor Author

@Neumann-A pipeline job x64_windows_static was abandoned with the output:

This job was abandoned. We have detected that logs from the agent may have not finished uploading. We have included our in-memory record of all log lines uploaded before we lost contact with the agent:

How to restart the job?

@JackBoosY
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@JackBoosY
Copy link
Contributor

@ZgblKylin Sorry for late, can you please merge your branch with master?

@ZgblKylin
Copy link
Contributor Author

@JackBoosY Sorry for late, I've rebased this branch onto master, and fixed baseline version (from Qt4#3 to Qt5#4)

Moreover, I've tried migrate to manifest file, which failes in pipeline Create Diff

@JackBoosY JackBoosY added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Mar 26, 2021
@BillyONeal BillyONeal requested a review from JackBoosY April 29, 2021 00:51
@BillyONeal BillyONeal merged commit 2cfbf01 into microsoft:master Apr 29, 2021
@BillyONeal
Copy link
Member

Thanks for your contribution!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants