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!!