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.

Sign up for GitHub

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

ci: use correct openssl location #279

Merged
merged 5 commits into from
Oct 3, 2024
+14 −1
Merged

ci: use correct openssl location #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0fd468f
ci: print deps
Nerixyz Oct 3, 2024
52d4038
ssh
Nerixyz Oct 3, 2024
bb4dfc7
more mac
Nerixyz Oct 3, 2024
f0f8895
fix: +lib
Nerixyz Oct 3, 2024
aefcf5a
changelog
Nerixyz Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ jobs:
install_name_tool -id @executable_path/../Frameworks/libssl.3.dylib chatterino.app/Contents/Frameworks/libssl.3.dylib
install_name_tool -id @executable_path/../Frameworks/libcrypto.3.dylib chatterino.app/Contents/Frameworks/libcrypto.3.dylib

otool -L chatterino.app/Contents/Frameworks/libssl.3.dylib
# Fix the search path for libcrypto in libssl
otool -L chatterino.app/Contents/Frameworks/libssl.3.dylib \
| grep libcrypto.3.dylib \
Expand All @@ -340,6 +341,18 @@ jobs:
@executable_path/../Frameworks/libcrypto.3.dylib \
chatterino.app/Contents/Frameworks/libssl.3.dylib; \
done
# Fix the search path for lib{crypto,ssl} in chatterino
otool -L chatterino.app/Contents/MacOS/chatterino \
| grep /opt \
| cut -d" " -f1 \
| cut -f2 \
| while read og_entry; do \
echo $og_entry; \
install_name_tool -change \
"$og_entry" \
@executable_path/../Frameworks/$(echo $og_entry | sed -E 's/.*(libssl|libcrypto)/\1/') \
chatterino.app/Contents/MacOS/chatterino; \
done

./../.CI/CreateDMG.sh
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.c7.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
- Dev(macOS): Changed CFBundleIdentifier from `com.chatterino` to `app.7tv.chatterino7` (fec0dbdf558b1e6e358971a256f5540d34bb6a8d)
- Dev: Updated Conan version used in CI to 2.4 (330d05d50ffd296b34744dbcc97290534e8cf704)
- Dev(Windows): Updated `libavif` to 1.0.4, `boost` to 1.85, and `openssl` to 3.2.2 (330d05d50ffd296b34744dbcc97290534e8cf704)
- Dev(macOS): A single universal app is now released for macOS (#274)
- Dev(macOS): A single universal app is now released for macOS (#274, #279)
- Dev: Refactored paints to avoid creation of intermediate widgets (#277)
Loading