From 077a58a2e8113d05d92db1f5cc802a2fa687d956 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 3 Apr 2023 16:31:14 +0100 Subject: [PATCH] Fix wrong sqlcipher build being used due to cache conflict (#606) --- .github/workflows/build_linux.yaml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml index ce517913..f9285d35 100644 --- a/.github/workflows/build_linux.yaml +++ b/.github/workflows/build_linux.yaml @@ -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 @@ -88,6 +88,19 @@ jobs: --deb-custom-control=debcontrol 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 if: inputs.deploy-mode uses: actions/upload-artifact@v3