dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-04-15 09:26:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ab/resize-image' into ab/resize-image

Browse Source
This commit is contained in:
IC Rainbow
2025-01-22 19:02:27 +02:00
parent 6718a9e5b4 a7045eee2e
commit 916cd4c9a5
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/build.yml vendored
View File

@@ -136,6 +136,11 @@ jobs:
echo " extra-include-dirs: /opt/homebrew/opt/openssl@3.0/include" >> cabal.project.local
echo " extra-lib-dirs: /opt/homebrew/opt/openssl@3.0/lib" >> cabal.project.local
echo " flags: +openssl" >> cabal.project.local
echo "" >> cabal.project.local
echo "package jpeg-turbo" >> cabal.project.local
echo " extra-include-dirs: /opt/homebrew/opt/libjpeg-turbo/include" >> cabal.project.local
echo " extra-lib-dirs: /opt/homebrew/opt/libjpeg-turbo/lib" >> cabal.project.local
echo " flags: +static" >> cabal.project.local
- name: Unix prepare cabal.project.local for Mac
if: matrix.os == 'macos-13'
@@ -150,6 +155,11 @@ jobs:
echo " extra-include-dirs: /usr/local/opt/openssl@3.0/include" >> cabal.project.local
echo " extra-lib-dirs: /usr/local/opt/openssl@3.0/lib" >> cabal.project.local
echo " flags: +openssl" >> cabal.project.local
echo "" >> cabal.project.local
echo "package jpeg-turbo" >> cabal.project.local
echo " extra-include-dirs: /usr/local/opt/libjpeg-turbo/include" >> cabal.project.local
echo " extra-lib-dirs: /usr/local/opt/libjpeg-turbo/lib" >> cabal.project.local
echo " flags: +static" >> cabal.project.local
- name: Install AppImage dependencies
if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
@@ -170,6 +180,9 @@ jobs:
echo "ignore-project: False" >> cabal.project.local
echo "package direct-sqlcipher" >> cabal.project.local
echo " flags: +openssl" >> cabal.project.local
echo "" >> cabal.project.local
echo "package jpeg-turbo" >> cabal.project.local
echo " flags: +static-gcc" >> cabal.project.local
- name: Unix build CLI
id: unix_cli_build
@@ -351,6 +364,8 @@ jobs:
echo " flags: +openssl" >> cabal.project.local
echo " extra-include-dirs: $openssl_windows_style_path\include" >> cabal.project.local
echo " extra-lib-dirs: $openssl_windows_style_path" >> cabal.project.local
echo "package jpeg-turbo" >> cabal.project.local
echo " flags: +pkgconfig" >> cabal.project.local
rm -rf dist-newstyle/src/direct-sq*
sed -i "s/, unix /--, unix /" simplex-chat.cabal