Skip to content

fix x86_64 build#437

Merged
hannesa2 merged 2 commits intogitx:masterfrom
chrisirhc:chua/test-x86
Mar 25, 2024
Merged

fix x86_64 build#437
hannesa2 merged 2 commits intogitx:masterfrom
chrisirhc:chua/test-x86

Conversation

@chrisirhc
Copy link
Copy Markdown
Contributor

@chrisirhc chrisirhc commented Mar 24, 2024

This reverts commit 5eebaa0, then applies a fix for the build by unlinking openssl.
Previously, the openssl@3 version installed seemed to be causing a conflict in the build.
I tested this locally and verified it on the PR.

This reverts commit 5eebaa0, reversing
changes made to 5736345.
@chrisirhc
Copy link
Copy Markdown
Contributor Author

chrisirhc commented Mar 24, 2024

Hm just saw from https://github.com/gitx/gitx/actions/runs/8306072213/job/22733712786 :

2024-03-16T07:02:24.7573640Z ld: warning: object file (External/libcrypto.a(ct_vfy.o)) was built for newer macOS version (12.0) than being linked (10.9)
2024-03-16T07:02:24.7574320Z ld: warning: object file (External/libcrypto.a(ct_b64.o)) was built for newer macOS version (12.0) than being linked (10.9)
2024-03-16T07:02:24.7574580Z Undefined symbols for architecture x86_64:
2024-03-16T07:02:24.7574810Z   "_EVP_PKEY_get_id", referenced from:
2024-03-16T07:02:24.7575180Z       __libssh2_ed25519_new_private_frommemory in libssh2.a(crypto.o)
2024-03-16T07:02:24.7575460Z       __libssh2_pub_priv_keyfile in libssh2.a(crypto.o)
2024-03-16T07:02:24.7575790Z       __libssh2_pub_priv_keyfilememory in libssh2.a(crypto.o)
2024-03-16T07:02:24.7576060Z ld: symbol(s) not found for architecture x86_64
2024-03-16T07:02:24.7576670Z clang: error: linker command failed with exit code 1 (use -v to see invocation)
2024-03-16T07:02:24.7576990Z 
2024-03-16T07:02:24.7599340Z ##[error]Process completed with exit code 65.
2024-03-16T07:02:24.7857530Z Post job cleanup

Perhaps we'll need to update the build to support MacOS 12 and above only?

@hannesa2
Copy link
Copy Markdown
Contributor

Just trying to see what the error was, since the logs were removed.

Now you see the error again 👍
It would be nice, if you could fix the x86 build

@chrisirhc
Copy link
Copy Markdown
Contributor Author

@hannesa2 I'm testing out unlinking openssl@3 to see if that unbreaks the build.
This is what fixed the build locally when I tried it, since the build is expecting openssl@1, not 3.

@hannesa2
Copy link
Copy Markdown
Contributor

hannesa2 commented Mar 25, 2024

Unfortunately, I've to push always a button to make your branch build on CI.
If you make the pull request on your fork, it should run automatically, except the arm64. But this is not necessary for this pull request

@chrisirhc
Copy link
Copy Markdown
Contributor Author

chrisirhc commented Mar 25, 2024

Unfortunately, I've to push always a button to make your branch build on CI. If you make the pull request on your fork, it should run automatically, except the arm64. But this is not necessary for this pull request

Hm I think you can approve permissions for me to allow me to run CI. Running it on my fork probably won't work since it doesn't have the certificates set up.

But looks like the fix b8c4d19 worked. See logs in https://github.com/gitx/gitx/actions/runs/8417015697/job/23044846310 .
The build is passing again and the archive was created.

I can clean up the commits so that this PR is mergeable.

Perhaps the CI script can be adjusted to remove the `brew install openssl`
parts, but I wanted to keep the changes minimal since I don't have permissions
to keep re-running CI on this repository.
@chrisirhc
Copy link
Copy Markdown
Contributor Author

Cleaned up the commits with a description.

@chrisirhc chrisirhc marked this pull request as ready for review March 25, 2024 09:16
@chrisirhc chrisirhc changed the title WIP x86 Revert "Merge pull request #431 from gitx/Drop-x86" fix x86_64 build Mar 25, 2024
@hannesa2
Copy link
Copy Markdown
Contributor

Nice, thank you

@hannesa2 hannesa2 merged commit ef77769 into gitx:master Mar 25, 2024
- name: Show openssl version
run: |
openssl version
- name: Unlink openssl 3
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I see, this was the breaking change

@hannesa2 hannesa2 mentioned this pull request Mar 25, 2024
@hannesa2 hannesa2 added the pipeline CI pipeline label Nov 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pipeline CI pipeline

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants