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 skia to m133-60b586b703-1 #61

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ permissions:
contents: write

env:
version: m126-6fd3120c1b-1
version: m133-60b586b703-1
Copy link
Member

Choose a reason for hiding this comment

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

The plan was to update to m132 (LTS).

Also where I can review the merge conflicts resolution result?

Copy link
Author

@Schahen Schahen Jan 24, 2025

Choose a reason for hiding this comment

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

Also where I can review the merge conflicts resolution result?

@MatkovIvan where you've reviewed them before? The procedure as I've understand it (based on our document) is about resolving this conflicts and then updating the skiko branch.

I don't like this procedure, I do think there's a room for improvement in current workflow and definitely will be happy if we'll have more established, thorough and transparent procedure - so I'm not trying to brush off your question, I'm asking whether there's an established procedure as of now?

Copy link
Author

Choose a reason for hiding this comment

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

as of LTS - I'll rerelease skiko branch on m132, my bad, missed the fact the m133 is prerelease!


jobs:
macos:
Expand Down
Loading