From 7d0b21109c258c2e725a8757524365eb81bc2aff Mon Sep 17 00:00:00 2001 From: Subhamoy Biswas Date: Wed, 6 Nov 2024 21:01:20 +0530 Subject: [PATCH] (ci/cd): ci test8 --- .github/workflows/release.yml | 10 +++--- CHANGELOG.md | 9 +++++ src-tauri/Cargo.lock | 55 +++++++++++++++++++++++++++++++ src-tauri/Cargo.toml | 1 + src-tauri/src/main.rs | 1 + src-tauri/tauri.linux.conf.json | 2 +- src-tauri/tauri.macos.conf.json | 2 +- src-tauri/tauri.windows.conf.json | 2 +- 8 files changed, 74 insertions(+), 8 deletions(-) create mode 100644 CHANGELOG.md diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 44e6f8b..1ee00d8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,10 +12,10 @@ jobs: fail-fast: false matrix: include: - - platform: 'macos-latest' - args: '--target aarch64-apple-darwin' - - platform: 'macos-latest' - args: '--target x86_64-apple-darwin' + # - platform: 'macos-latest' + # args: '--target aarch64-apple-darwin' + # - platform: 'macos-latest' + # args: '--target x86_64-apple-darwin' - platform: 'ubuntu-22.04' args: '' - platform: 'windows-latest' @@ -58,7 +58,7 @@ jobs: with: tagName: v__VERSION__ releaseName: 'pytubepp-helper-v__VERSION__' - releaseBody: 'See the assets to download this version and install.' + releaseBody: CHANGELOG.md releaseDraft: true prerelease: false args: ${{ matrix.args }} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..d7b5de0 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,9 @@ +- Major API Update (not compatible with previous versions) +- Minor fixes and improvements +> This is an Unsigned Build (Windows doesn't trust this so, it may flag this as malicious software, in that case, disable Windows SmartScreen and Defender, install it, and then re-enable them) + +### ⬇️ Download Section + +| Arch\OS | Windows (msi) | Windows (exe) | Linux (deb) | Linux (rpm) | +| :---- | :---- | :---- | :---- | :---- | +| x64 | [Download](https://github.com/neosubhamoy/pytubepp-helper/releases/download/v0.2.0-beta/pytubepp-helper_0.2.0_x64_en-US.msi) | [Download](https://github.com/neosubhamoy/pytubepp-helper/releases/download/v0.2.0-beta/pytubepp-helper_0.2.0_x64-setup.exe) | [Download](https://github.com/neosubhamoy/pytubepp-helper/releases/download/v0.2.0-beta/pytubepp-helper_0.2.0_amd64.deb) | [Download](https://github.com/neosubhamoy/pytubepp-helper/releases/download/v0.2.0-beta/pytubepp-helper-0.2.0-1.x86_64.rpm) | \ No newline at end of file diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 8ec8b86..99b2bb9 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -803,6 +803,16 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "fix-path-env" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/fix-path-env-rs#0e479e2804edc1a7e5f15ece2b48ee30858c2838" +dependencies = [ + "home", + "strip-ansi-escapes", + "thiserror", +] + [[package]] name = "flate2" version = "1.0.31" @@ -1311,6 +1321,15 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "html5ever" version = "0.26.0" @@ -2456,6 +2475,7 @@ dependencies = [ name = "pytubepp-helper" version = "0.2.0" dependencies = [ + "fix-path-env", "futures-util", "serde", "serde_json", @@ -3215,6 +3235,15 @@ dependencies = [ "quote", ] +[[package]] +name = "strip-ansi-escapes" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa" +dependencies = [ + "vte", +] + [[package]] name = "strsim" version = "0.11.1" @@ -4026,6 +4055,12 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + [[package]] name = "uuid" version = "1.10.0" @@ -4091,6 +4126,26 @@ dependencies = [ "libc", ] +[[package]] +name = "vte" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" +dependencies = [ + "utf8parse", + "vte_generate_state_changes", +] + +[[package]] +name = "vte_generate_state_changes" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "walkdir" version = "2.5.0" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 950f47d..fcffbe8 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -17,6 +17,7 @@ serde_json = "1" tokio = { version = "1.39.2", features = ["full"] } tokio-tungstenite = "*" futures-util = "0.3.30" +fix-path-env = { git = "https://github.com/tauri-apps/fix-path-env-rs" } [features] # This feature is used for production builds or when a dev server is not specified, DO NOT REMOVE!! diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index d389f61..241edff 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -148,6 +148,7 @@ fn download_stream(url: String, stream: String) { #[tokio::main] async fn main() { + let _ = fix_path_env::fix(); let websocket_state = Arc::new(Mutex::new(WebSocketState { sender: None, response_channel: ResponseChannel { sender: None }, diff --git a/src-tauri/tauri.linux.conf.json b/src-tauri/tauri.linux.conf.json index 62b3779..8463294 100644 --- a/src-tauri/tauri.linux.conf.json +++ b/src-tauri/tauri.linux.conf.json @@ -118,7 +118,7 @@ }, "bundle": { "active": true, - "targets": "all", + "targets": ["deb", "rpm"], "identifier": "com.neosubhamoy.pytubepp.helper", "icon": [ "icons/32x32.png", diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json index e338da9..876aaa0 100644 --- a/src-tauri/tauri.macos.conf.json +++ b/src-tauri/tauri.macos.conf.json @@ -118,7 +118,7 @@ }, "bundle": { "active": true, - "targets": "all", + "targets": ["app", "dmg"], "identifier": "com.neosubhamoy.pytubepp.helper", "icon": [ "icons/32x32.png", diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json index aed4302..b378b73 100644 --- a/src-tauri/tauri.windows.conf.json +++ b/src-tauri/tauri.windows.conf.json @@ -126,7 +126,7 @@ }, "bundle": { "active": true, - "targets": "all", + "targets": ["msi", "nsis"], "identifier": "com.neosubhamoy.pytubepp.helper", "icon": [ "icons/32x32.png",