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

Jump to bottom

Bumped up macOS version #78

Merged
merged 1 commit into from Sep 2, 2021
Merged

Bumped up macOS version #78

merged 1 commit into from Sep 2, 2021

Conversation

iMonZ
Copy link
Contributor

@iMonZ iMonZ commented Sep 2, 2021

Since GitHub hasn't updated macos-latest I bumped up the macOS version from 10.15 to 10.16
(For some reason, the macOS 10.15 CI uses the Xcode 11 SDK, while the macOS 10.16 CI uses the Xcode 12.X SDK, which lead to less compatibility with the Rosetta 2 interpreter)

@PureTryOut
Copy link
Collaborator

Hmm, strange. We should remember to change it back to macos-latest once Github has resolved that on their side.

Could you reword your commit to CI: set macOS version to 11?

@iMonZ
Copy link
Contributor Author

iMonZ commented Sep 2, 2021

Should I delete the branch and create a new one?

@iMonZ iMonZ mentioned this pull request Sep 2, 2021
Closed
@iMonZ iMonZ closed this Sep 2, 2021
@PureTryOut
Copy link
Collaborator

Nooo... You shouldn't

@PureTryOut
Copy link
Collaborator

People should really learn to use Git properly lol.

Look into rebasing.

@iMonZ
Copy link
Contributor Author

iMonZ commented Sep 2, 2021

Alright thanks! Now I know that

@iMonZ
CI: set macOS version to 11
525f1e1 
GitHub set the macOS-latest version to 10.15 while the actual latest version is macOS 11.
This is a temporary fix to resolve Rosetta 2 issues since GitHubs macOS 10.15 only got the Xcode 11 SDK while Rosetta 2 works best with the macOS 11 target SDK
@iMonZ
Copy link
Contributor Author

iMonZ commented Sep 2, 2021

People should really learn to use Git properly lol.

Look into rebasing.

Done! But how can I refresh this PR?

@PureTryOut
Copy link
Collaborator

It happens automatically if you git push --force. Basically you rebased on your local branch, but the remote branch (here on Github) hasn't yet updated with your local changes.

@iMonZ
Copy link
Contributor Author

iMonZ commented Sep 2, 2021 •
edited

It happens automatically if you git push --force. Basically you rebased on your local branch, but the remote branch (here on Github) hasn't yet updated with your local changes.

Is there a workaround, so the PR is updated by my remote branch without creating a new PR? Or is it just a matter of time?

@iMonZ iMonZ reopened this Sep 2, 2021
@PureTryOut
Copy link
Collaborator

No the moment you git push --force, the PR is updated. A PR is really just a representation of your remote branch.

Like just happened, your PR is now updated.

@PureTryOut PureTryOut merged commit 7947367 into Lea-fish:main Sep 2, 2021
@iMonZ
Copy link
Contributor Author

iMonZ commented Sep 2, 2021 •
edited

No the moment you git push --force, the PR is updated. A PR is really just a representation of your remote branch.

Like just happened, your PR is now updated.

Somehow the PR was locked by GitHub, so I needed to change the commit back to the PR one, reopen the PR and then push the new commit again, so it works.

It says Cannot reopen PR with forced push

@iMonZ iMonZ deleted the patch-1 branch September 2, 2021 20:25
@PureTryOut
Copy link
Collaborator

I noticed that, strange. But normally you don't just close the PR if you want to update the branch, so it's fine 😉

@iMonZ
Copy link
Contributor Author

iMonZ commented Sep 2, 2021

I noticed that, strange. But normally you don't just close the PR if you want to update the branch, so it's fine 😉

Yeah, git is not my perfect tool, but I'm working on that.
Every day you learn something new 😄

@PureTryOut
Copy link
Collaborator

No problem, glad to see https://git-rebase.io helped you out at least 😉

@iMonZ
Copy link
Contributor Author

iMonZ commented Sep 2, 2021

No problem, glad to see https://git-rebase.io helped you out at least 😉

Thanks for the info.
And especially thanks for working on this amazing project!
I waited this for years since Mojang stopped really working on the Java edition.

@iMonZ
Copy link
Contributor Author

iMonZ commented Sep 2, 2021 •
edited

Hm, strange, the Artefact is not building.
It got the same error as: https://github.com/terrarier2111/Leafish/pull/83

While on your PR, the error disappeared a few minutes later

  1. https://github.com/terrarier2111/Leafish/actions/runs/1195646622 same error
  2. https://github.com/terrarier2111/Leafish/actions/runs/1195662684 its working.

@PureTryOut
Copy link
Collaborator

Yeah because I changed the CI in that PR to fix that error. Once that's merged it'll be fixed for the future.

Note https://github.com/terrarier2111/Leafish/pull/83/files#diff-73e17259d77e5fbef83b2bdbbe4dc40a912f807472287f7f45b77e0cbf78792dL163

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@iMonZ @PureTryOut