From 2653fb05156c72b83cf6d9968d0a5427db195784 Mon Sep 17 00:00:00 2001 From: Igor Katson Date: Fri, 8 Dec 2023 10:16:29 +0000 Subject: [PATCH] Tweak release.yaml to release files quicker --- .github/workflows/release.yml | 180 ++++++++++++++++-------------- Cargo.toml | 1 - desktop/src-tauri/Cargo.lock | 2 +- desktop/src-tauri/Cargo.toml | 2 +- desktop/src-tauri/tauri.conf.json | 4 +- 5 files changed, 99 insertions(+), 90 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6ce4ff7..0f81838 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,102 +12,112 @@ jobs: release-windows: runs-on: windows-latest steps: - - uses: actions/checkout@v2 - - name: install Tauri - run: - cargo install tauri-cli --profile dev - - name: npm install (desktop) - working-directory: desktop - run: - npm install - - name: npm install (librqbit/webui) - working-directory: crates/librqbit/webui - run: - npm install - - name: cargo tauri build - working-directory: desktop - run: - cargo tauri build --ci + - uses: actions/checkout@v2 + - name: install Tauri + run: cargo install tauri-cli --profile dev + - name: npm install (desktop) + working-directory: desktop + run: npm install + - name: npm install (librqbit/webui) + working-directory: crates/librqbit/webui + run: npm install - - name: Build release - run: - cargo build --profile release-github - - uses: softprops/action-gh-release@v1 - with: - generate_release_notes: true - files: | - target/release-github/rqbit.exe - desktop/src-tauri/target/release/bundle/msi/rqbit-desktop_5.0.0_x64_en-US.msi + - name: cargo tauri build + working-directory: desktop + run: cargo tauri build --ci + - uses: softprops/action-gh-release@v1 + with: + generate_release_notes: true + files: | + desktop/src-tauri/target/release/bundle/msi/rqbit-desktop_5.0.1_x64_en-US.msi + + - name: Build release + run: cargo build --profile release-github + - uses: softprops/action-gh-release@v1 + with: + generate_release_notes: true + files: | + target/release-github/rqbit.exe cross-compile-on-macos: runs-on: macos-11 steps: - - uses: actions/checkout@v2 - - name: install linux cross compiler - run: - brew tap messense/macos-cross-toolchains && - brew install x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu arm-unknown-linux-gnueabihf armv7-unknown-linux-gnueabihf + - uses: actions/checkout@v2 - - name: install Tauri - run: - cargo install tauri-cli --profile dev - - name: npm install (desktop) - working-directory: desktop - run: - npm install - - name: npm install (librqbit/webui) - working-directory: crates/librqbit/webui - run: - npm install - - name: cargo tauri build - working-directory: desktop - run: - rustup target add aarch64-apple-darwin && - cargo tauri build --target universal-apple-darwin --ci + - name: install Tauri + run: cargo install tauri-cli --profile dev + - name: npm install (desktop) + working-directory: desktop + run: npm install + - name: npm install (librqbit/webui) + working-directory: crates/librqbit/webui + run: npm install - - name: Make a directory for output artifacts - run: - mkdir -p target/artifacts + - name: cargo tauri build + working-directory: desktop + run: rustup target add aarch64-apple-darwin && + cargo tauri build --target universal-apple-darwin --ci + - uses: softprops/action-gh-release@v1 + with: + generate_release_notes: true + files: | + desktop/src-tauri/target/universal-apple-darwin/release/bundle/dmg/rqbit-desktop_5.0.1_universal.dmg - - name: Build release linux x86_64 binary - run: - rustup target install x86_64-unknown-linux-gnu && - make release-linux-x86_64 && - mv target/x86_64-unknown-linux-gnu/release-github/rqbit target/artifacts/rqbit-linux-static-x86_64 + - name: Make a directory for output artifacts + run: mkdir -p target/artifacts - - name: Build release linux armv6 binary - run: - rustup target install arm-unknown-linux-gnueabihf && - make release-linux-armv6 && - mv target/arm-unknown-linux-gnueabihf/release-github/rqbit target/artifacts/rqbit-linux-static-armv6 + - name: Build release OSX universal binary + run: rustup target install aarch64-apple-darwin && + cargo build --profile release-github && + cargo build --profile release-github --target aarch64-apple-darwin && + lipo ./target/release-github/rqbit ./target/aarch64-apple-darwin/release-github/rqbit -create -output ./target/artifacts/rqbit-osx-universal + - uses: softprops/action-gh-release@v1 + with: + generate_release_notes: true + files: | + target/artifacts/rqbit-osx-universal - - name: Build release linux armv7 binary - run: - rustup target install armv7-unknown-linux-gnueabihf && - make release-linux-armv7 && - mv target/armv7-unknown-linux-gnueabihf/release-github/rqbit target/artifacts/rqbit-linux-static-armv7 + - name: install linux cross compiler + run: brew tap messense/macos-cross-toolchains && + brew install x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu arm-unknown-linux-gnueabihf armv7-unknown-linux-gnueabihf - - name: Build release linux aarch64 binary - run: - rustup target install aarch64-unknown-linux-gnu && - make release-linux-aarch64 && - mv target/aarch64-unknown-linux-gnu/release-github/rqbit target/artifacts/rqbit-linux-static-aarch64 + - name: Build release linux x86_64 binary + run: rustup target install x86_64-unknown-linux-gnu && + make release-linux-x86_64 && + mv target/x86_64-unknown-linux-gnu/release-github/rqbit target/artifacts/rqbit-linux-static-x86_64 + - uses: softprops/action-gh-release@v1 + with: + generate_release_notes: true + files: | + target/artifacts/rqbit-linux-static-x86_64 - - name: Build release OSX universal binary - run: - rustup target install aarch64-apple-darwin && - cargo build --profile release-github && - cargo build --profile release-github --target aarch64-apple-darwin && - lipo ./target/release-github/rqbit ./target/aarch64-apple-darwin/release-github/rqbit -create -output ./target/artifacts/rqbit-osx-universal + - name: Build release linux armv6 binary + run: rustup target install arm-unknown-linux-gnueabihf && + make release-linux-armv6 && + mv target/arm-unknown-linux-gnueabihf/release-github/rqbit target/artifacts/rqbit-linux-static-armv6 - - uses: softprops/action-gh-release@v1 - with: - generate_release_notes: true - files: | - target/artifacts/rqbit-osx-universal - target/artifacts/rqbit-linux-static-x86_64 - target/artifacts/rqbit-linux-static-aarch64 - target/artifacts/rqbit-linux-static-armv6 - target/artifacts/rqbit-linux-static-armv7 - desktop/src-tauri/target/universal-apple-darwin/release/bundle/dmg/rqbit-desktop_5.0.0_universal.dmg + - uses: softprops/action-gh-release@v1 + with: + generate_release_notes: true + files: | + target/artifacts/rqbit-linux-static-armv6 + - name: Build release linux armv7 binary + run: rustup target install armv7-unknown-linux-gnueabihf && + make release-linux-armv7 && + mv target/armv7-unknown-linux-gnueabihf/release-github/rqbit target/artifacts/rqbit-linux-static-armv7 + - uses: softprops/action-gh-release@v1 + with: + generate_release_notes: true + files: | + target/artifacts/rqbit-linux-static-armv7 + + - name: Build release linux aarch64 binary + run: rustup target install aarch64-unknown-linux-gnu && + make release-linux-aarch64 && + mv target/aarch64-unknown-linux-gnu/release-github/rqbit target/artifacts/rqbit-linux-static-aarch64 + - uses: softprops/action-gh-release@v1 + with: + generate_release_notes: true + files: | + target/artifacts/rqbit-linux-static-aarch64 diff --git a/Cargo.toml b/Cargo.toml index 166e697..a3a89a4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,5 +22,4 @@ debug = true [profile.release-github] inherits = "release" -lto = true debug = false \ No newline at end of file diff --git a/desktop/src-tauri/Cargo.lock b/desktop/src-tauri/Cargo.lock index f5d2715..8c5004a 100644 --- a/desktop/src-tauri/Cargo.lock +++ b/desktop/src-tauri/Cargo.lock @@ -3011,7 +3011,7 @@ dependencies = [ [[package]] name = "rqbit-desktop" -version = "5.0.0" +version = "5.0.1" dependencies = [ "anyhow", "base64 0.21.5", diff --git a/desktop/src-tauri/Cargo.toml b/desktop/src-tauri/Cargo.toml index 375079d..e66cd11 100644 --- a/desktop/src-tauri/Cargo.toml +++ b/desktop/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rqbit-desktop" -version = "5.0.0" +version = "5.0.1" description = "rqbit torrent client" authors = ["you"] license = "" diff --git a/desktop/src-tauri/tauri.conf.json b/desktop/src-tauri/tauri.conf.json index da26750..4201e28 100644 --- a/desktop/src-tauri/tauri.conf.json +++ b/desktop/src-tauri/tauri.conf.json @@ -7,7 +7,7 @@ }, "package": { "productName": "rqbit-desktop", - "version": "5.0.0" + "version": "5.0.1" }, "tauri": { "allowlist": { @@ -42,4 +42,4 @@ } ] } -} \ No newline at end of file +}