The Wayback Machine - https://web.archive.org/web/20250819131115/https://github.com/SFTtech/openage/pull/1296
Skip to content

update macOS ci config #1296

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

Merged
merged 3 commits into from
Nov 8, 2020
Merged

update macOS ci config #1296

merged 3 commits into from
Nov 8, 2020

Conversation

TheJJ
Copy link
Member

@TheJJ TheJJ commented Aug 25, 2020

pls work
fixes #1295

closes #1238

@TheJJ TheJJ added bugfix Restores intended behavior ci Related to our continuous integration systems (kevin, github-actions, ...) labels Aug 25, 2020
@TheJJ TheJJ force-pushed the fix-mac-workflow branch 3 times, most recently from 993fe37 to bc1ef73 Compare August 25, 2020 16:26
@TheJJ
Copy link
Member Author

TheJJ commented Aug 25, 2020

It's getting way further now, but apparently png.h is not included, so the struct png_image is unknown.

@TheJJ TheJJ force-pushed the fix-mac-workflow branch 2 times, most recently from 73f0a24 to e7b867f Compare August 26, 2020 10:26
@TheJJ
Copy link
Member Author

TheJJ commented Aug 26, 2020

png header still not included i think, even after merging #1301.

@TheJJ TheJJ force-pushed the fix-mac-workflow branch 3 times, most recently from acda1c4 to 4f97b28 Compare August 26, 2020 14:11
@simonsan
Copy link
Contributor

@simonsan
Copy link
Contributor

simonsan commented Aug 26, 2020

I meant you are probably better off to use #1238 and change a bit there, because it is already optimized for caching and compresses homebrew stuff etc. Also this PR here shouldn't close #1238 because this one lacks 60-80% of the functionality of the PR you would close, which makes no actual sense to me. :-D

Besides #1238 is waiting since a few months for your review ...

@TheJJ
Copy link
Member Author

TheJJ commented Aug 26, 2020

seems like the png version does not match. but homebrew says it has 1.6 installed:

brew install libpng
Warning: libpng 1.6.37 is already installed and up-to-date
To reinstall 1.6.37, run `brew reinstall libpng`

./configure fails:

CMake Error at /usr/local/Cellar/cmake/3.18.1/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:165 (message):
  Could NOT find PNG: Found unsuitable version "1.4.12", but required is at
  least "1.6" (found /usr/local/lib/libpng.dylib)
Call Stack (most recent call first):
  /usr/local/Cellar/cmake/3.18.1/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:456 (_FPHSA_FAILURE_MESSAGE)
  /usr/local/Cellar/cmake/3.18.1/share/cmake/Modules/FindPNG.cmake:156 (find_package_handle_standard_args)
  openage/convert/service/export/png/CMakeLists.txt:1 (find_package)
heinezen
heinezen previously approved these changes Sep 6, 2020
Copy link
Member

@heinezen heinezen left a comment

Choose a reason for hiding this comment

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

Should be good to go :)

@heinezen heinezen changed the title update macOS ci config [WIP] update macOS ci config Sep 9, 2020
@TheJJ TheJJ force-pushed the fix-mac-workflow branch 2 times, most recently from 2e52438 to 7809938 Compare November 8, 2020 21:40
heinezen
heinezen previously approved these changes Nov 8, 2020
@heinezen heinezen changed the title [WIP] update macOS ci config update macOS ci config Nov 8, 2020
@heinezen heinezen merged commit b303555 into SFTtech:master Nov 8, 2020
@heinezen
Copy link
Member

heinezen commented Nov 8, 2020

🎉

@TheJJ TheJJ deleted the fix-mac-workflow branch November 9, 2020 10:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix Restores intended behavior ci Related to our continuous integration systems (kevin, github-actions, ...)
3 participants