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

Rename VERSION to VERSION.txt #14

Merged
merged 1 commit into from
Sep 2, 2022
Merged

Rename VERSION to VERSION.txt #14

merged 1 commit into from
Sep 2, 2022

Conversation

snukky
Copy link
Member

@snukky snukky commented Sep 2, 2022

This pulls some changes from the upstream google@308d9bf , which should fix compilation errors on Azure DevOps/GitHub Actions macOS images: marian-nmt/marian-dev#871

@snukky snukky requested review from emjotde and rjai September 2, 2022 07:24
Copy link
Collaborator

@rjai rjai left a comment

Choose a reason for hiding this comment

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

LGTM

@rjai
Copy link
Collaborator

rjai commented Sep 2, 2022

Do we at some point also want to merge from google master?

@snukky
Copy link
Member Author

snukky commented Sep 2, 2022

Thanks! And yes, I think so, but the two repos diverged lately, so that's a bigger task.

@snukky snukky merged commit 31ac8e8 into master Sep 2, 2022
emjotde pushed a commit to marian-nmt/marian-dev that referenced this pull request Oct 4, 2022
macos-10.15 will become unsupported in December 2022. Changes:
* Upgrade Azure DevOps to macos-12
* Pull marian-nmt/sentencepiece#14
* Fix clang 13 errors as in #939
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