From 8b035ac68ee16773ddf2b37a2ad05f5630a6c998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20K=C3=B6nig?= Date: Tue, 17 Dec 2024 14:39:43 +0100 Subject: [PATCH 01/10] test workflow --- .github/workflows/ubuntu_test.yml | 51 +++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 .github/workflows/ubuntu_test.yml diff --git a/.github/workflows/ubuntu_test.yml b/.github/workflows/ubuntu_test.yml new file mode 100644 index 00000000..82a288ba --- /dev/null +++ b/.github/workflows/ubuntu_test.yml @@ -0,0 +1,51 @@ +name: ubuntu_test + +on: + workflow_dispatch: + push: + branches: + - ubuntu_test +jobs: + build_desktop: + name: Build desktop app for ${{ matrix.platform }} + strategy: + matrix: + platform: [ ubuntu-24.04 ] + runs-on: ${{ matrix.platform }} + env: + TAURI_SIGNING_PRIVATE_KEY: "${{ secrets.TAURI_PRIVATE_KEY }}" + TAURI_SIGNING_PRIVATE_KEY_PASSWORD: "${{ secrets.TAURI_KEY_PASSWORD }}" + + steps: + ### system setup + + - uses: actions/checkout@v4 + + - uses: actions/setup-node@v4 + with: + node-version: '22.5.1' + cache: 'yarn' + + - run: yarn + + - run: rustup toolchain install stable + + - name: linux > install dependencies + run: | + sudo apt-get update + sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev + + ### build linux + + - name: linux > build + run: yarn tauri:build + + - name: linux > upload artifacts + uses: actions/upload-artifact@v4 + with: + name: linux_artifacts + if-no-files-found: error + path: | + src-tauri/target/release/bundle/deb/elasticvue_*_amd64.deb + src-tauri/target/release/bundle/appimage/elasticvue_*_amd64.* + src-tauri/target/release/elasticvue From 82e5aac2f9a4056785c72df19bc3d9775fec9595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20K=C3=B6nig?= Date: Tue, 17 Dec 2024 15:00:14 +0100 Subject: [PATCH 02/10] try ubuntu-22.04 --- .github/workflows/ubuntu_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu_test.yml b/.github/workflows/ubuntu_test.yml index 82a288ba..652738a4 100644 --- a/.github/workflows/ubuntu_test.yml +++ b/.github/workflows/ubuntu_test.yml @@ -10,7 +10,7 @@ jobs: name: Build desktop app for ${{ matrix.platform }} strategy: matrix: - platform: [ ubuntu-24.04 ] + platform: [ ubuntu-22.04 ] runs-on: ${{ matrix.platform }} env: TAURI_SIGNING_PRIVATE_KEY: "${{ secrets.TAURI_PRIVATE_KEY }}" From 84b25c09f423155195f8b85d00dfbb00fd76e2fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20K=C3=B6nig?= Date: Tue, 17 Dec 2024 15:05:39 +0100 Subject: [PATCH 03/10] older version of libwebkit2gtk --- .github/workflows/ubuntu_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu_test.yml b/.github/workflows/ubuntu_test.yml index 652738a4..1e52b1e3 100644 --- a/.github/workflows/ubuntu_test.yml +++ b/.github/workflows/ubuntu_test.yml @@ -33,7 +33,7 @@ jobs: - name: linux > install dependencies run: | sudo apt-get update - sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev + sudo apt-get install -y libwebkit2gtk-4.1-0=2.44.0-2 libwebkit2gtk-4.1-dev=2.44.0-2 build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev ### build linux From 85260a184185ad05947f9f579b6d53fb044f6165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20K=C3=B6nig?= Date: Tue, 17 Dec 2024 15:08:51 +0100 Subject: [PATCH 04/10] older version of libwebkit2gtk - 2.44.3-0 --- .github/workflows/ubuntu_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu_test.yml b/.github/workflows/ubuntu_test.yml index 1e52b1e3..a02df8a6 100644 --- a/.github/workflows/ubuntu_test.yml +++ b/.github/workflows/ubuntu_test.yml @@ -33,7 +33,7 @@ jobs: - name: linux > install dependencies run: | sudo apt-get update - sudo apt-get install -y libwebkit2gtk-4.1-0=2.44.0-2 libwebkit2gtk-4.1-dev=2.44.0-2 build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev + sudo apt-get install -y libwebkit2gtk-4.1-0=2.44.3-0 libwebkit2gtk-4.1-dev=2.44.3-0 build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev ### build linux From 535ff7ae075ba3ea246729f5ffa51d8419b3bdbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20K=C3=B6nig?= Date: Tue, 17 Dec 2024 15:10:41 +0100 Subject: [PATCH 05/10] older version of libwebkit2gtk - 2.44.3 --- .github/workflows/ubuntu_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu_test.yml b/.github/workflows/ubuntu_test.yml index a02df8a6..73ce6dca 100644 --- a/.github/workflows/ubuntu_test.yml +++ b/.github/workflows/ubuntu_test.yml @@ -33,7 +33,7 @@ jobs: - name: linux > install dependencies run: | sudo apt-get update - sudo apt-get install -y libwebkit2gtk-4.1-0=2.44.3-0 libwebkit2gtk-4.1-dev=2.44.3-0 build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev + sudo apt-get install -y libwebkit2gtk-4.1-0=2.44.3 libwebkit2gtk-4.1-dev=2.44.3 build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev ### build linux From cfde91b25472e660b56175228416f5b0965d38b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20K=C3=B6nig?= Date: Fri, 20 Dec 2024 22:52:07 +0100 Subject: [PATCH 06/10] test ubuntu build with older webkit --- .github/workflows/ubuntu_test.yml | 2 +- src-tauri/src/lib.rs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu_test.yml b/.github/workflows/ubuntu_test.yml index 73ce6dca..8a042a5e 100644 --- a/.github/workflows/ubuntu_test.yml +++ b/.github/workflows/ubuntu_test.yml @@ -33,7 +33,7 @@ jobs: - name: linux > install dependencies run: | sudo apt-get update - sudo apt-get install -y libwebkit2gtk-4.1-0=2.44.3 libwebkit2gtk-4.1-dev=2.44.3 build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev + sudo apt-get install -y libwebkit2gtk-4.0-37=2.36.0-2ubuntu1 libwebkit2gtk-4.0-dev=2.36.0-2ubuntu1 build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev ### build linux diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index efc4153d..bcbe5bbc 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -17,6 +17,8 @@ pub fn run() { env_logger::init(); let ctx = tauri::generate_context!(); + std::env::set_var("WEBKIT_DISABLE_DMABUF_RENDERER", "1"); + std::env::set_var("WEBKIT_DISABLE_COMPOSITING_MODE", "1"); tauri::Builder::default() .plugin(tauri_plugin_process::init()) From 6dc711df07d0b685ec9660e674af741ab48bcfa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20K=C3=B6nig?= Date: Fri, 20 Dec 2024 22:53:41 +0100 Subject: [PATCH 07/10] more old versions --- .github/workflows/ubuntu_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu_test.yml b/.github/workflows/ubuntu_test.yml index 8a042a5e..e07d080b 100644 --- a/.github/workflows/ubuntu_test.yml +++ b/.github/workflows/ubuntu_test.yml @@ -33,7 +33,7 @@ jobs: - name: linux > install dependencies run: | sudo apt-get update - sudo apt-get install -y libwebkit2gtk-4.0-37=2.36.0-2ubuntu1 libwebkit2gtk-4.0-dev=2.36.0-2ubuntu1 build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev + sudo apt-get install -y libwebkit2gtk-4.0-37=2.36.0-2ubuntu1 libwebkit2gtk-4.0-dev=2.36.0-2ubuntu1 libjavascriptcoregtk-4.0-18=2.36.0-2ubuntu1 libjavascriptcoregtk-4.0-dev=2.36.0-2ubuntu1 gir1.2-javascriptcoregtk-4.0=2.36.0-2ubuntu1 gir1.2-webkit2-4.0=2.36.0-2ubuntu1 build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev ### build linux From ee4f88e2cbc5e50aeccb916841936860b5131bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20K=C3=B6nig?= Date: Fri, 20 Dec 2024 23:04:48 +0100 Subject: [PATCH 08/10] more old versions --- .github/workflows/ubuntu_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu_test.yml b/.github/workflows/ubuntu_test.yml index e07d080b..8bee573e 100644 --- a/.github/workflows/ubuntu_test.yml +++ b/.github/workflows/ubuntu_test.yml @@ -10,7 +10,7 @@ jobs: name: Build desktop app for ${{ matrix.platform }} strategy: matrix: - platform: [ ubuntu-22.04 ] + platform: [ ubuntu-24.04 ] runs-on: ${{ matrix.platform }} env: TAURI_SIGNING_PRIVATE_KEY: "${{ secrets.TAURI_PRIVATE_KEY }}" @@ -33,7 +33,7 @@ jobs: - name: linux > install dependencies run: | sudo apt-get update - sudo apt-get install -y libwebkit2gtk-4.0-37=2.36.0-2ubuntu1 libwebkit2gtk-4.0-dev=2.36.0-2ubuntu1 libjavascriptcoregtk-4.0-18=2.36.0-2ubuntu1 libjavascriptcoregtk-4.0-dev=2.36.0-2ubuntu1 gir1.2-javascriptcoregtk-4.0=2.36.0-2ubuntu1 gir1.2-webkit2-4.0=2.36.0-2ubuntu1 build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev + sudo apt-get install -y libwebkit2gtk-4.1-0 2.44.3-0ubuntu0.24.04.1 libwebkit2gtk-4.1-dev 2.44.3-0ubuntu0.24.04.1 build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev ### build linux From 585c0ac2a2a2aba67d5e0cc4b287aab958765bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20K=C3=B6nig?= Date: Fri, 20 Dec 2024 23:06:45 +0100 Subject: [PATCH 09/10] more old versions --- .github/workflows/ubuntu_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu_test.yml b/.github/workflows/ubuntu_test.yml index 8bee573e..1d81d7fe 100644 --- a/.github/workflows/ubuntu_test.yml +++ b/.github/workflows/ubuntu_test.yml @@ -33,7 +33,7 @@ jobs: - name: linux > install dependencies run: | sudo apt-get update - sudo apt-get install -y libwebkit2gtk-4.1-0 2.44.3-0ubuntu0.24.04.1 libwebkit2gtk-4.1-dev 2.44.3-0ubuntu0.24.04.1 build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev + sudo apt-get install -y libwebkit2gtk-4.1-0=2.44.3-0ubuntu0.24.04.1 libwebkit2gtk-4.1-dev=2.44.3-0ubuntu0.24.04.1 build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev ### build linux From 14b65899fbf009fb1c93c6a5c505b18a40039b86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20K=C3=B6nig?= Date: Fri, 20 Dec 2024 23:18:42 +0100 Subject: [PATCH 10/10] more old versions --- .github/workflows/ubuntu_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu_test.yml b/.github/workflows/ubuntu_test.yml index 1d81d7fe..583aa2ed 100644 --- a/.github/workflows/ubuntu_test.yml +++ b/.github/workflows/ubuntu_test.yml @@ -33,7 +33,7 @@ jobs: - name: linux > install dependencies run: | sudo apt-get update - sudo apt-get install -y libwebkit2gtk-4.1-0=2.44.3-0ubuntu0.24.04.1 libwebkit2gtk-4.1-dev=2.44.3-0ubuntu0.24.04.1 build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev + sudo apt-get install -y libwebkit2gtk-4.1-0=2.44.0-2 libwebkit2gtk-4.1-dev=2.44.0-2 libjavascriptcoregtk-4.1-0=2.44.0-2 libjavascriptcoregtk-4.1-dev=2.44.0-2 gir1.2-javascriptcoregtk-4.1=2.44.0-2 gir1.2-webkit2-4.1=2.44.0-2 build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev ### build linux