Skip to content

Fix Xcode 13 build (alternate PR to kick CI)#1130

Merged
yonaskolb merged 4 commits intoyonaskolb:masterfrom
mthole:mthole/ci-fix
Sep 23, 2021
Merged

Fix Xcode 13 build (alternate PR to kick CI)#1130
yonaskolb merged 4 commits intoyonaskolb:masterfrom
mthole:mthole/ci-fix

Conversation

@mthole
Copy link
Copy Markdown
Contributor

@mthole mthole commented Sep 23, 2021

This is just a copy of #1129, but from my fork so I can attempt to kick CI a few times and see if I can figure out what's amiss.

@mthole
Copy link
Copy Markdown
Contributor Author

mthole commented Sep 23, 2021

image

Ah well, foo, that didn't work. @yonaskolb, could you approve the workflow run?

@mthole
Copy link
Copy Markdown
Contributor Author

mthole commented Sep 23, 2021

This is now green on my fork: https://github.com/mthole/XcodeGen/actions/runs/1267184165

image

@mthole mthole mentioned this pull request Sep 23, 2021
@freddi-kit
Copy link
Copy Markdown
Collaborator

freddi-kit commented Sep 23, 2021

CI is running after Collaborator approval, I approved the original repo to check it. Would you mind closing this PR?
Thank you so much!

@freddi-kit
Copy link
Copy Markdown
Collaborator

Sorry I found you have a workaround for Xcode13, let me check it

@mthole mthole closed this Sep 23, 2021
@mthole mthole reopened this Sep 23, 2021
@freddi-kit
Copy link
Copy Markdown
Collaborator

freddi-kit commented Sep 23, 2021

i just approved it to run it on CI

@mthole
Copy link
Copy Markdown
Contributor Author

mthole commented Sep 23, 2021

🤞

CHANGELOG.md Outdated
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

And please write your name with @raptorxcz :)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Could you place it to New Version column? ex) https://github.com/yonaskolb/XcodeGen/pull/796/files#diff-06572a96a58dc510037d5efa622f9bec8519bc1beab13c9f251e97e657a9d4ed

Is 2.25.0 not the correct version? The most recent release is 2.24.0 currently.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

When writing about changes, the changes before releasing should be placed in the New Version column.
Before the releasing, maintainer changes the New Version with new one (i expect 2.26.0 in this case)

FYI: c3d936c

Copy link
Copy Markdown
Collaborator

@freddi-kit freddi-kit Sep 23, 2021

Choose a reason for hiding this comment

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

ah sorry. its Next Version

image

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Roger that, I'll move the line up!

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Thank you so much! 😄

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

I will actually go under 2.25.0 as I pre-emptively added that heading yesterday. Will fix in master

@freddi-kit
Copy link
Copy Markdown
Collaborator

All Green 👍

Copy link
Copy Markdown
Collaborator

@freddi-kit freddi-kit 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, Thank you for first contribution @mthole and nice fixing @raptorxcz !

@freddi-kit
Copy link
Copy Markdown
Collaborator

freddi-kit commented Sep 23, 2021

@yonaskolb I think we can merge it after fixing change log

strategy:
matrix:
xcode: ["12"]
xcode: ["12.5.1", "13.0"]
Copy link
Copy Markdown
Collaborator

@freddi-kit freddi-kit Sep 23, 2021

Choose a reason for hiding this comment

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

Do we still need 12.5.1? @yonaskolb I think it is only takes long time to build by 2 veresion

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I think it's wise to leave both 12.5.x and 13.0, at least for a few weeks until Xcode 13 adoption is mainstream. It's a nice guard against accidentally regressing one of the major Xcode builds out there. And the builds run in parallel, so it doesn't actually take longer AFAICT.

I'd suggest revisiting and removing 12.x in a couple months.

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Agree, let's keep till there's at least a 13.1

Copy link
Copy Markdown
Owner

@yonaskolb yonaskolb left a comment

Choose a reason for hiding this comment

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

Thanks all! 🙏

@yonaskolb yonaskolb merged commit fa6c5c9 into yonaskolb:master Sep 23, 2021
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.

3 participants