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

Homebrew Troubleshooting - 0.8.x #824

Merged
merged 14 commits into from
May 2, 2024

Conversation

stephengtuggy
Copy link
Contributor

@stephengtuggy stephengtuggy commented Dec 10, 2023

Thank you for submitting a pull request and becoming a contributor to the Vega Strike Core Engine.

Please answer the following:

Code Changes:

Issues:
Further fixes #812

Purpose:

  • What is this pull request trying to do? Make macOS CI builds more reproducible, so that they pass more consistently
  • What release is this for? 0.8.x
  • Is there a project or milestone we should apply this to? 0.8.x

@stephengtuggy stephengtuggy added CI/CD Compiler Error Breaks build on at least one supported platform labels Dec 10, 2023
@stephengtuggy stephengtuggy self-assigned this Dec 10, 2023
@stephengtuggy stephengtuggy linked an issue Dec 10, 2023 that may be closed by this pull request
@stephengtuggy stephengtuggy marked this pull request as ready for review April 17, 2024 17:08
@stephengtuggy
Copy link
Contributor Author

Hey, guys. With this PR, 0.8.x should both build consistently and run on macOS. Can I get some reviews, please? And some testing is also needed, esp. on Mac. I will see if I can do some of that.

Copy link
Member

@BenjamenMeyer BenjamenMeyer left a comment

Choose a reason for hiding this comment

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

LGTM - is there anything we need to port to 0.9.x and master?

@stephengtuggy
Copy link
Contributor Author

LGTM - is there anything we need to port to 0.9.x and master?

Yes, we will probably need to port quite a few of these changes to 0.9.x and to master. Those items will need to be on the project board(s), huh?

@stephengtuggy
Copy link
Contributor Author

So this PR has been merged, judging from the contents of the 0.8.x branch. But the PR screen doesn't show it. Weird.

I think I will just close this Pull Request, noting that it has, in fact, been merged.

@stephengtuggy
Copy link
Contributor Author

Hmm. Maybe this PR didn't get merged after all. Reopening.

@stephengtuggy stephengtuggy reopened this May 2, 2024
@stephengtuggy
Copy link
Contributor Author

The Rocky Linux 8.7 failure is expected; the code no longer builds on Rocky Linux 8.x, and as such, I guess we are no longer supporting it.

@stephengtuggy stephengtuggy merged commit 6ece75c into vegastrike:0.8.x May 2, 2024
27 of 28 checks passed
stephengtuggy added a commit to stephengtuggy/Vega-Strike-Engine-Source that referenced this pull request May 2, 2024
* Add Brewfile; add a few entries to .gitignore

* Add .github/dependabot.yml and script/bootstrap-on-macos.sh; update Brewfile and .github/workflows/macos-ci.yml

* Slight adjustment to macos-ci.yml

* ...

* ...

* Add Brewfile.lock.json, among other things

* Add brew update back in

* Omit Brewfile.lock.json

* gl_init.cpp: Check for macOS by checking whether __APPLE__ and __MACH__ are defined, rather than __MACOSX__

* 22 files: Check for macOS by checking whether __APPLE__ and __MACH__ are defined, rather than MACOSX

* Trying yet another approach

* bootstrap-on-macos.sh: ...

* bootstrap-on-macos.sh: ...

* bootstrap-on-macos.sh, macos-ci.yml: Add "[email protected]" to the to-install list, alongside "[email protected]". Clean up commented-out code
@stephengtuggy stephengtuggy deleted the 0.8.x_Brewfile branch May 2, 2024 04:45
@stephengtuggy
Copy link
Contributor Author

Good. Now it's merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/CD Compiler Error Breaks build on at least one supported platform
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Some macOS builds failing due to Python version conflicts
2 participants