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

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

Merged
merged 8 commits into from
Apr 3, 2023
Merged

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

Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
03805de
Fix wrong sqlcipher build being used due to cache conflict
t3chguy Apr 3, 2023
cb3c2b8
Add basic ldd check
t3chguy Apr 3, 2023
15efcf4
fix paths
t3chguy Apr 3, 2023
317b148
Merge branch 'develop' into t3chguy/fix-linux-sqlcipher-linking
t3chguy Apr 3, 2023
2d6b86a
iterate
t3chguy Apr 3, 2023
03e308d
Merge remote-tracking branch 'origin/t3chguy/fix-linux-sqlcipher-link…
t3chguy Apr 3, 2023
6fa5b69
test
t3chguy Apr 3, 2023
c4e266d
invert if
t3chguy Apr 3, 2023
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
14 changes: 13 additions & 1 deletion .github/workflows/build_linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
id: cache
uses: actions/cache@v3
with:
key: ${{ runner.os }}-${{ hashFiles('hakDependencies.json', 'electronVersion') }}
key: ${{ runner.os }}-${{ inputs.sqlcipher }}-${{ hashFiles('hakDependencies.json', 'electronVersion') }}
path: |
./.hak

Expand Down Expand Up @@ -88,6 +88,18 @@ jobs:
--deb-custom-control=debcontrol
yarn build --publish never -l --config electron-builder.json

- name: Check ldd
run: |
if [ "$SQLCIPHER_STATIC" == "1" ]; then
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
else
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
fi
env:
SQLCIPHER_STATIC: ${{ inputs.sqlcipher == 'static' && '1' || '' }}

- name: Stash deb package
if: inputs.deploy-mode
uses: actions/upload-artifact@v3
Expand Down