CringeStudios/element-desktop
5
0
Fork 0
mirror of https://github.com/CringeStudios/element-desktop.git synced 2025-01-31 05:29:58 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix wrong sqlcipher build being used due to cache conflict (#606)

Browse Source
This commit is contained in:
Michael Telatynski 2023-04-03 16:31:14 +01:00 committed by GitHub
parent 7c0f11914b
commit 077a58a2e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/build_linux.yaml vendored
View File

@ -39,7 +39,7 @@ jobs:
id: cache id: cache
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
key: ${{ runner.os }}-${{ hashFiles('hakDependencies.json', 'electronVersion') }} key: ${{ runner.os }}-${{ inputs.sqlcipher }}-${{ hashFiles('hakDependencies.json', 'electronVersion') }}
path: | path: |
./.hak ./.hak
@ -88,6 +88,19 @@ jobs:
--deb-custom-control=debcontrol --deb-custom-control=debcontrol
yarn build --publish never -l --config electron-builder.json yarn build --publish never -l --config electron-builder.json
- name: Check ldd
run: |
ldd dist/linux-unpacked/resources/app.asar.unpacked/node_modules/matrix-seshat/native/index.node
if [ "$SQLCIPHER_STATIC" == "1" ]; then
ldd dist/linux-unpacked/resources/app.asar.unpacked/node_modules/matrix-seshat/native/index.node | grep -v libsqlcipher.so.0
ldd dist/linux-unpacked/resources/app.asar.unpacked/node_modules/matrix-seshat/native/index.node | grep libcrypto.so.1.1
else
ldd dist/linux-unpacked/resources/app.asar.unpacked/node_modules/matrix-seshat/native/index.node | grep libsqlcipher.so.0
ldd dist/linux-unpacked/resources/app.asar.unpacked/node_modules/matrix-seshat/native/index.node | grep -v libcrypto.so.1.1
fi
env:
SQLCIPHER_STATIC: ${{ inputs.sqlcipher == 'static' && '1' || '' }}
- name: Stash deb package - name: Stash deb package
if: inputs.deploy-mode if: inputs.deploy-mode
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3