From 470e9f9f1939ddef7a9cfcbe31f146a2666bdbc2 Mon Sep 17 00:00:00 2001 From: Danil Date: Sat, 15 Jun 2024 22:39:36 +0700 Subject: [PATCH 01/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 6d36a70..221aa5c 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -40,7 +40,7 @@ jobs: shell: bash uses: dtolnay/rust-toolchain@stable with: - targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }} + targets: ${{ matrix.platform == 'ubuntu-latest' && 'x86_64-unknown-linux-gnux32,x86_64-unknown-linux-musl,x86_64-unknown-linux-ohos,x86_64-unknown-linux-none' || '' }} - name: Install Ubuntu dependencies if: matrix.platform == 'ubuntu-latest' run: | From 33b034c7efe983b855af0685ec1a1d87528630fe Mon Sep 17 00:00:00 2001 From: Danil Date: Sat, 15 Jun 2024 22:57:07 +0700 Subject: [PATCH 02/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 221aa5c..9417346 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -40,7 +40,7 @@ jobs: shell: bash uses: dtolnay/rust-toolchain@stable with: - targets: ${{ matrix.platform == 'ubuntu-latest' && 'x86_64-unknown-linux-gnux32,x86_64-unknown-linux-musl,x86_64-unknown-linux-ohos,x86_64-unknown-linux-none' || '' }} + targets: ${{ matrix.platform == 'ubuntu-latest' && 'x86_64-unknown-linux-gnux32,x86_64-unknown-linux-musl,x86_64-unknown-linux-ohos' || '' }} - name: Install Ubuntu dependencies if: matrix.platform == 'ubuntu-latest' run: | From 95831f163b5ade3b134f904a149f324a31329ca4 Mon Sep 17 00:00:00 2001 From: Danil Date: Sat, 15 Jun 2024 23:53:42 +0700 Subject: [PATCH 03/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 9417346..26aa979 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -16,6 +16,15 @@ jobs: - platform: ubuntu-latest output_dir_one: src-tauri/target/release/bundle/appimage/**.AppImage output_dir_two: src-tauri/target/release/bundle/deb/**.deb + args: --target x86_64-unknown-linux-gnux32 + - platform: ubuntu-latest + output_dir_one: src-tauri/target/release/bundle/appimage/**.AppImage + output_dir_two: src-tauri/target/release/bundle/deb/**.deb + args: --target x86_64-unknown-linux-musl + - platform: ubuntu-latest + output_dir_one: src-tauri/target/release/bundle/appimage/**.AppImage + output_dir_two: src-tauri/target/release/bundle/deb/**.deb + args: --target x86_64-unknown-linux-ohos - platform: windows-latest output_dir_one: src-tauri/target/release/bundle/msi/**.msi output_dir_two: src-tauri/target/release/bundle/nsis/**.exe From c926f1cc808958c6b9c9e830aaa76553780ed24d Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 00:08:56 +0700 Subject: [PATCH 04/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 26aa979..6348f69 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -54,7 +54,7 @@ jobs: if: matrix.platform == 'ubuntu-latest' run: | sudo apt update - sudo apt-get install libgtk-3-dev -y + sudo apt-get install libgtk-3-dev gtk3-devel cmake libglvnd-dev -y sudo apt install libwebkit2gtk-4.0-dev \ build-essential \ curl \ From b0b322728fb2e135b71a7b94c329a01ac1943b33 Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 00:10:41 +0700 Subject: [PATCH 05/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 6348f69..e3b3cb6 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -54,7 +54,7 @@ jobs: if: matrix.platform == 'ubuntu-latest' run: | sudo apt update - sudo apt-get install libgtk-3-dev gtk3-devel cmake libglvnd-dev -y + sudo apt-get install libgtk-3-dev cmake libglvnd-dev -y sudo apt install libwebkit2gtk-4.0-dev \ build-essential \ curl \ From 344b03428fe7df3a26b0ec64d151d6c2c5c6a67f Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 08:20:57 +0700 Subject: [PATCH 06/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index e3b3cb6..bd7c958 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -54,7 +54,7 @@ jobs: if: matrix.platform == 'ubuntu-latest' run: | sudo apt update - sudo apt-get install libgtk-3-dev cmake libglvnd-dev -y + sudo apt-get install libgtk-3-dev cmake libglvnd-dev libglvnd -y sudo apt install libwebkit2gtk-4.0-dev \ build-essential \ curl \ @@ -64,6 +64,10 @@ jobs: libgtk-3-dev \ libayatana-appindicator3-dev \ librsvg2-dev -y + echo " " + pkg-config --list-all + pkg-config --libs --cflags glib-2.0 + ls /usr/lib/ - name: Install frontend run: | npm install From 8ce5ae94a3d233e8bb823f207f6065ed2577e542 Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 08:23:10 +0700 Subject: [PATCH 07/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index bd7c958..599f50b 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -54,7 +54,7 @@ jobs: if: matrix.platform == 'ubuntu-latest' run: | sudo apt update - sudo apt-get install libgtk-3-dev cmake libglvnd-dev libglvnd -y + sudo apt-get install libgtk-3-dev cmake libglvnd-dev -y sudo apt install libwebkit2gtk-4.0-dev \ build-essential \ curl \ From 987f208cb341168f95a25a38fca65f5c6df07b0c Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 08:29:50 +0700 Subject: [PATCH 08/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 599f50b..d1c527b 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -65,9 +65,8 @@ jobs: libayatana-appindicator3-dev \ librsvg2-dev -y echo " " - pkg-config --list-all - pkg-config --libs --cflags glib-2.0 ls /usr/lib/ + export PKG_CONFIG_PATH=/usr/share/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig - name: Install frontend run: | npm install From aa1b0d466c40d66f22dc211b384efca296e5309c Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 08:38:26 +0700 Subject: [PATCH 09/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-tauri/Cargo.lock | 29 +++++++++++++++++++++++++++++ src-tauri/Cargo.toml | 1 + 2 files changed, 30 insertions(+) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index bee247f..11d3597 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -1933,6 +1933,28 @@ dependencies = [ "windows-sys 0.42.0", ] +[[package]] +name = "openssl-src" +version = "300.3.1+3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + [[package]] name = "overload" version = "0.1.1" @@ -3208,6 +3230,7 @@ version = "0.0.0" dependencies = [ "dotenv", "magic-crypt", + "openssl-sys", "rust-fuzzy-search", "serde", "serde_json", @@ -3419,6 +3442,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + [[package]] name = "version-compare" version = "0.0.11" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index c7b38fe..078ab10 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -17,6 +17,7 @@ serde_json = "1" magic-crypt = "3.1.13" rust-fuzzy-search = "0.1.1" dotenv = "0.15.0" +openssl-sys = {version = "0.9", features = ["vendored"] } [features] # This feature is used for production builds or when a dev server is not specified, DO NOT REMOVE!! From 679b79c8a0c641a0f39a600760e416004706d5eb Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 08:45:40 +0700 Subject: [PATCH 10/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 13 ++++++------- src-tauri/Cargo.lock | 29 ----------------------------- src-tauri/Cargo.toml | 1 - 3 files changed, 6 insertions(+), 37 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index d1c527b..a40409e 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -16,15 +16,15 @@ jobs: - platform: ubuntu-latest output_dir_one: src-tauri/target/release/bundle/appimage/**.AppImage output_dir_two: src-tauri/target/release/bundle/deb/**.deb - args: --target x86_64-unknown-linux-gnux32 + args: x86_64-unknown-linux-gnux32 - platform: ubuntu-latest output_dir_one: src-tauri/target/release/bundle/appimage/**.AppImage output_dir_two: src-tauri/target/release/bundle/deb/**.deb - args: --target x86_64-unknown-linux-musl + args: x86_64-unknown-linux-musl - platform: ubuntu-latest output_dir_one: src-tauri/target/release/bundle/appimage/**.AppImage output_dir_two: src-tauri/target/release/bundle/deb/**.deb - args: --target x86_64-unknown-linux-ohos + args: x86_64-unknown-linux-ohos - platform: windows-latest output_dir_one: src-tauri/target/release/bundle/msi/**.msi output_dir_two: src-tauri/target/release/bundle/nsis/**.exe @@ -53,6 +53,8 @@ jobs: - name: Install Ubuntu dependencies if: matrix.platform == 'ubuntu-latest' run: | + rustup toolchain install ${{ matrix.args }} + rustup default ${{ matrix.args }} sudo apt update sudo apt-get install libgtk-3-dev cmake libglvnd-dev -y sudo apt install libwebkit2gtk-4.0-dev \ @@ -64,9 +66,6 @@ jobs: libgtk-3-dev \ libayatana-appindicator3-dev \ librsvg2-dev -y - echo " " - ls /usr/lib/ - export PKG_CONFIG_PATH=/usr/share/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig - name: Install frontend run: | npm install @@ -78,7 +77,7 @@ jobs: releaseName: ${{ env.APP_NAME }} v__VERSION__ releaseDraft: true prerelease: false - args: ${{ matrix.args }} + args: --target ${{ matrix.args }} - name: Publish Tauri App uses: akkuman/gitea-release-action@v1 with: diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 11d3597..bee247f 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -1933,28 +1933,6 @@ dependencies = [ "windows-sys 0.42.0", ] -[[package]] -name = "openssl-src" -version = "300.3.1+3.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - [[package]] name = "overload" version = "0.1.1" @@ -3230,7 +3208,6 @@ version = "0.0.0" dependencies = [ "dotenv", "magic-crypt", - "openssl-sys", "rust-fuzzy-search", "serde", "serde_json", @@ -3442,12 +3419,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "version-compare" version = "0.0.11" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 078ab10..c7b38fe 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -17,7 +17,6 @@ serde_json = "1" magic-crypt = "3.1.13" rust-fuzzy-search = "0.1.1" dotenv = "0.15.0" -openssl-sys = {version = "0.9", features = ["vendored"] } [features] # This feature is used for production builds or when a dev server is not specified, DO NOT REMOVE!! From ef3d6b5ee366cfbdc64a998ce06a3534589d6dca Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 08:52:24 +0700 Subject: [PATCH 11/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index a40409e..43fb7b2 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -16,15 +16,6 @@ jobs: - platform: ubuntu-latest output_dir_one: src-tauri/target/release/bundle/appimage/**.AppImage output_dir_two: src-tauri/target/release/bundle/deb/**.deb - args: x86_64-unknown-linux-gnux32 - - platform: ubuntu-latest - output_dir_one: src-tauri/target/release/bundle/appimage/**.AppImage - output_dir_two: src-tauri/target/release/bundle/deb/**.deb - args: x86_64-unknown-linux-musl - - platform: ubuntu-latest - output_dir_one: src-tauri/target/release/bundle/appimage/**.AppImage - output_dir_two: src-tauri/target/release/bundle/deb/**.deb - args: x86_64-unknown-linux-ohos - platform: windows-latest output_dir_one: src-tauri/target/release/bundle/msi/**.msi output_dir_two: src-tauri/target/release/bundle/nsis/**.exe @@ -46,17 +37,14 @@ jobs: lfs: true token: ${{secrets.RELEASE_TOKEN}} - name: install Rust stable - shell: bash uses: dtolnay/rust-toolchain@stable with: - targets: ${{ matrix.platform == 'ubuntu-latest' && 'x86_64-unknown-linux-gnux32,x86_64-unknown-linux-musl,x86_64-unknown-linux-ohos' || '' }} + targets: ${{ matrix.args }} - name: Install Ubuntu dependencies if: matrix.platform == 'ubuntu-latest' run: | - rustup toolchain install ${{ matrix.args }} - rustup default ${{ matrix.args }} sudo apt update - sudo apt-get install libgtk-3-dev cmake libglvnd-dev -y + sudo apt-get install cmake libglvnd-dev -y sudo apt install libwebkit2gtk-4.0-dev \ build-essential \ curl \ @@ -77,7 +65,11 @@ jobs: releaseName: ${{ env.APP_NAME }} v__VERSION__ releaseDraft: true prerelease: false - args: --target ${{ matrix.args }} + #args: --target ${{ matrix.args }} + - name: Search files + run: + ls src-tauri/ + find . -type f -name "*.bin" - name: Publish Tauri App uses: akkuman/gitea-release-action@v1 with: From fadac8871e512a410f9739bee4ba146432c60784 Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 08:55:47 +0700 Subject: [PATCH 12/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 43fb7b2..a2f9e26 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -16,6 +16,15 @@ jobs: - platform: ubuntu-latest output_dir_one: src-tauri/target/release/bundle/appimage/**.AppImage output_dir_two: src-tauri/target/release/bundle/deb/**.deb + args: --target x86_64-unknown-linux-gnux32 + - platform: ubuntu-latest + output_dir_one: src-tauri/target/release/bundle/appimage/**.AppImage + output_dir_two: src-tauri/target/release/bundle/deb/**.deb + args: --target x86_64-unknown-linux-musl + - platform: ubuntu-latest + output_dir_one: src-tauri/target/release/bundle/appimage/**.AppImage + output_dir_two: src-tauri/target/release/bundle/deb/**.deb + args: --target x86_64-unknown-linux-ohos - platform: windows-latest output_dir_one: src-tauri/target/release/bundle/msi/**.msi output_dir_two: src-tauri/target/release/bundle/nsis/**.exe @@ -39,12 +48,12 @@ jobs: - name: install Rust stable uses: dtolnay/rust-toolchain@stable with: - targets: ${{ matrix.args }} + targets: ${{ matrix.platform == 'ubuntu-latest' && 'x86_64-unknown-linux-gnux32,x86_64-unknown-linux-musl,x86_64-unknown-linux-ohos' || '' }} - name: Install Ubuntu dependencies if: matrix.platform == 'ubuntu-latest' run: | sudo apt update - sudo apt-get install cmake libglvnd-dev -y + sudo apt-get install cmake libglvnd-dev glib-2.0 -y sudo apt install libwebkit2gtk-4.0-dev \ build-essential \ curl \ @@ -65,7 +74,7 @@ jobs: releaseName: ${{ env.APP_NAME }} v__VERSION__ releaseDraft: true prerelease: false - #args: --target ${{ matrix.args }} + args: ${{ matrix.args }} - name: Search files run: ls src-tauri/ From 87bd174671caf4fae2d921ce227abe45f6cf6bbc Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 09:32:51 +0700 Subject: [PATCH 13/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index a2f9e26..b8fd14e 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -13,18 +13,12 @@ jobs: fail-fast: false matrix: include: - - platform: ubuntu-latest + - platform: arch-latest output_dir_one: src-tauri/target/release/bundle/appimage/**.AppImage output_dir_two: src-tauri/target/release/bundle/deb/**.deb - args: --target x86_64-unknown-linux-gnux32 - - platform: ubuntu-latest - output_dir_one: src-tauri/target/release/bundle/appimage/**.AppImage - output_dir_two: src-tauri/target/release/bundle/deb/**.deb - args: --target x86_64-unknown-linux-musl - - platform: ubuntu-latest - output_dir_one: src-tauri/target/release/bundle/appimage/**.AppImage - output_dir_two: src-tauri/target/release/bundle/deb/**.deb - args: --target x86_64-unknown-linux-ohos + #- platform: ubuntu-latest + # output_dir_one: src-tauri/target/release/bundle/appimage/**.AppImage + # output_dir_two: src-tauri/target/release/bundle/deb/**.deb - platform: windows-latest output_dir_one: src-tauri/target/release/bundle/msi/**.msi output_dir_two: src-tauri/target/release/bundle/nsis/**.exe From e7990e3e64d201e0dc26399e7b43e3081244efb5 Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 09:40:01 +0700 Subject: [PATCH 14/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index b8fd14e..edaef1a 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -32,6 +32,11 @@ jobs: # output_dir_two: src-tauri/target/x86_64-apple-darwin/release/bundle/dmg/**.dmg runs-on: ${{ matrix.platform }} steps: + - name: Arch dependencies + if: matrix.platform == 'arch-latest' + run: + pacman -Syu + pacman -S nodejs npm -y - name: Setup Node.js uses: actions/setup-node@v4 - name: Checkout repository From 342d131f238b1e84082c75869190512d0bcac6ed Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 09:41:36 +0700 Subject: [PATCH 15/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index edaef1a..03c6594 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -35,7 +35,6 @@ jobs: - name: Arch dependencies if: matrix.platform == 'arch-latest' run: - pacman -Syu pacman -S nodejs npm -y - name: Setup Node.js uses: actions/setup-node@v4 From 9e9451d29c22fb1aa88c35846ebf3eb43822b889 Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 09:42:17 +0700 Subject: [PATCH 16/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 03c6594..9b5c223 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -35,7 +35,7 @@ jobs: - name: Arch dependencies if: matrix.platform == 'arch-latest' run: - pacman -S nodejs npm -y + sudo pacman -S nodejs npm -y - name: Setup Node.js uses: actions/setup-node@v4 - name: Checkout repository From d2ffa7a1079798ba47004e23e39848d9b37715d1 Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 09:43:47 +0700 Subject: [PATCH 17/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 9b5c223..9031768 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -35,7 +35,7 @@ jobs: - name: Arch dependencies if: matrix.platform == 'arch-latest' run: - sudo pacman -S nodejs npm -y + sudo pacman --noconfirm -Syu nodejs npm - name: Setup Node.js uses: actions/setup-node@v4 - name: Checkout repository From c473068da1029f53003728436f719848f933a6e7 Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 09:47:15 +0700 Subject: [PATCH 18/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 9031768..d3e751f 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -34,7 +34,8 @@ jobs: steps: - name: Arch dependencies if: matrix.platform == 'arch-latest' - run: + run: | + sudo su sudo pacman --noconfirm -Syu nodejs npm - name: Setup Node.js uses: actions/setup-node@v4 From c3c547fb660caf3e3877514e0bbeb38afc17348d Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 09:49:00 +0700 Subject: [PATCH 19/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index d3e751f..9031768 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -34,8 +34,7 @@ jobs: steps: - name: Arch dependencies if: matrix.platform == 'arch-latest' - run: | - sudo su + run: sudo pacman --noconfirm -Syu nodejs npm - name: Setup Node.js uses: actions/setup-node@v4 From 6e63e6aeaa6f5491301ca96dccd1c6e56f690bb9 Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 09:49:39 +0700 Subject: [PATCH 20/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 9031768..d3f5b73 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -35,7 +35,7 @@ jobs: - name: Arch dependencies if: matrix.platform == 'arch-latest' run: - sudo pacman --noconfirm -Syu nodejs npm + pacman --noconfirm -Syu nodejs npm - name: Setup Node.js uses: actions/setup-node@v4 - name: Checkout repository From 5f5258b40337e3727f22df64e165b964decdf6a7 Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 09:52:39 +0700 Subject: [PATCH 21/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index d3f5b73..72bb5b2 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -35,7 +35,8 @@ jobs: - name: Arch dependencies if: matrix.platform == 'arch-latest' run: - pacman --noconfirm -Syu nodejs npm + pacman --noconfirm -Syu nodejs npm git rust rustup + rustup default stable - name: Setup Node.js uses: actions/setup-node@v4 - name: Checkout repository From 55b2ef2096747d658faea82908e55c71cc8cb629 Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 09:53:40 +0700 Subject: [PATCH 22/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 72bb5b2..ba2ec56 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -34,7 +34,7 @@ jobs: steps: - name: Arch dependencies if: matrix.platform == 'arch-latest' - run: + run: | pacman --noconfirm -Syu nodejs npm git rust rustup rustup default stable - name: Setup Node.js From 1105eec5013b23a46a0d606789d8dbaffd4d6dd4 Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 09:57:31 +0700 Subject: [PATCH 23/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index ba2ec56..6eded82 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -35,7 +35,7 @@ jobs: - name: Arch dependencies if: matrix.platform == 'arch-latest' run: | - pacman --noconfirm -Syu nodejs npm git rust rustup + pacman --noconfirm -Syu nodejs npm git rust rustup git-lfs rustup default stable - name: Setup Node.js uses: actions/setup-node@v4 From c21987721b25b9a12e072bfd316098141d30362c Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 10:08:03 +0700 Subject: [PATCH 24/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 6eded82..0acdc6b 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -13,12 +13,13 @@ jobs: fail-fast: false matrix: include: - - platform: arch-latest - output_dir_one: src-tauri/target/release/bundle/appimage/**.AppImage - output_dir_two: src-tauri/target/release/bundle/deb/**.deb - #- platform: ubuntu-latest + #- platform: arch-latest # output_dir_one: src-tauri/target/release/bundle/appimage/**.AppImage # output_dir_two: src-tauri/target/release/bundle/deb/**.deb + - platform: ubuntu-latest + output_dir_one: src-tauri/target/release/bundle/appimage/**.AppImage + output_dir_two: src-tauri/target/release/bundle/deb/**.deb + args: x86_64-unknown-linux-gnux32 - platform: windows-latest output_dir_one: src-tauri/target/release/bundle/msi/**.msi output_dir_two: src-tauri/target/release/bundle/nsis/**.exe @@ -52,7 +53,7 @@ jobs: if: matrix.platform == 'ubuntu-latest' run: | sudo apt update - sudo apt-get install cmake libglvnd-dev glib-2.0 -y + sudo apt-get install cmake libglvnd-dev glib-2.0 libglib2.0-dev -y sudo apt install libwebkit2gtk-4.0-dev \ build-essential \ curl \ From 8a627509c87f7a9648a45b10f14ae04a7c19378d Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 10:14:54 +0700 Subject: [PATCH 25/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 0acdc6b..6bf3ec3 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -19,7 +19,7 @@ jobs: - platform: ubuntu-latest output_dir_one: src-tauri/target/release/bundle/appimage/**.AppImage output_dir_two: src-tauri/target/release/bundle/deb/**.deb - args: x86_64-unknown-linux-gnux32 + args: --target x86_64-unknown-linux-gnux32 - platform: windows-latest output_dir_one: src-tauri/target/release/bundle/msi/**.msi output_dir_two: src-tauri/target/release/bundle/nsis/**.exe From 099ebc0436abe2ec5fb8e20272b0d4b2752470ba Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 10:22:31 +0700 Subject: [PATCH 26/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 6bf3ec3..9b1f776 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -67,14 +67,16 @@ jobs: run: | npm install - name: Build Tauri app - uses: tauri-apps/tauri-action@v0 - env: - GITHUB_TOKEN: ${{secrets.RELEASE_TOKEN}} - with: - releaseName: ${{ env.APP_NAME }} v__VERSION__ - releaseDraft: true - prerelease: false - args: ${{ matrix.args }} + run: | + cargo tauri build ${{ matrix.args}} + #uses: tauri-apps/tauri-action@v0 + #env: + # GITHUB_TOKEN: ${{secrets.RELEASE_TOKEN}} + #with: + # releaseName: ${{ env.APP_NAME }} v__VERSION__ + # releaseDraft: true + # prerelease: false + # args: ${{ matrix.args }} - name: Search files run: ls src-tauri/ From 11d564d2f8beeff55fa23ef64e5934f532c44361 Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 10:52:45 +0700 Subject: [PATCH 27/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 9b1f776..35c1c78 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -52,6 +52,7 @@ jobs: - name: Install Ubuntu dependencies if: matrix.platform == 'ubuntu-latest' run: | + cargo add glib-sys@=0.15.10 sudo apt update sudo apt-get install cmake libglvnd-dev glib-2.0 libglib2.0-dev -y sudo apt install libwebkit2gtk-4.0-dev \ @@ -67,16 +68,14 @@ jobs: run: | npm install - name: Build Tauri app - run: | - cargo tauri build ${{ matrix.args}} - #uses: tauri-apps/tauri-action@v0 - #env: - # GITHUB_TOKEN: ${{secrets.RELEASE_TOKEN}} - #with: - # releaseName: ${{ env.APP_NAME }} v__VERSION__ - # releaseDraft: true - # prerelease: false - # args: ${{ matrix.args }} + uses: tauri-apps/tauri-action@v0 + env: + GITHUB_TOKEN: ${{secrets.RELEASE_TOKEN}} + with: + releaseName: ${{ env.APP_NAME }} v__VERSION__ + releaseDraft: true + prerelease: false + args: ${{ matrix.args }} - name: Search files run: ls src-tauri/ From b0d07b9ef49cd817e8ad09f36440cdef59d31133 Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 10:55:11 +0700 Subject: [PATCH 28/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 35c1c78..e596dc6 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -52,7 +52,6 @@ jobs: - name: Install Ubuntu dependencies if: matrix.platform == 'ubuntu-latest' run: | - cargo add glib-sys@=0.15.10 sudo apt update sudo apt-get install cmake libglvnd-dev glib-2.0 libglib2.0-dev -y sudo apt install libwebkit2gtk-4.0-dev \ @@ -67,6 +66,7 @@ jobs: - name: Install frontend run: | npm install + cargo add glib-sys@=0.15.10 - name: Build Tauri app uses: tauri-apps/tauri-action@v0 env: From c3b1988394899310f67ee2c32eb696faf60bd15b Mon Sep 17 00:00:00 2001 From: Danil Date: Sun, 16 Jun 2024 11:00:10 +0700 Subject: [PATCH 29/29] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index e596dc6..dba27a2 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -66,6 +66,7 @@ jobs: - name: Install frontend run: | npm install + cd src-tauri/ cargo add glib-sys@=0.15.10 - name: Build Tauri app uses: tauri-apps/tauri-action@v0