diff --git a/.github/workflows/linux_special.yml b/.github/workflows/linux_special.yml index bfaa22cd..4539ab2c 100644 --- a/.github/workflows/linux_special.yml +++ b/.github/workflows/linux_special.yml @@ -36,7 +36,7 @@ jobs: pre-build-args: "--cuda" rust-version: "stable" cuda-version: "12.4.1" - name: "ubuntu-22.04-cuda-12" + name: "ubuntu-22.04-nvidia-12" # Ubuntu 24.04 cuda # https://github.com/Jimver/cuda-toolkit/issues/365 @@ -45,7 +45,7 @@ jobs: # pre-build-args: "--cuda" # rust-version: "stable" # cuda-version: "12.4.1" - # name: "ubuntu-24.04-cuda-12" + # name: "ubuntu-24.04-nvidia-12" # Ubuntu 22.04 rocm - platform: "ubuntu-22.04" diff --git a/.github/workflows/windows_special.yml b/.github/workflows/windows_special.yml index 24107b45..5ebec65f 100644 --- a/.github/workflows/windows_special.yml +++ b/.github/workflows/windows_special.yml @@ -28,7 +28,7 @@ jobs: - platform: "windows-latest" args: '--features="cuda,openblas"' pre-build-args: "--cuda --openblas" - name: 'cuda-12.5.0' + name: 'nvidia-12.5.0' cuda-verison: '12.5.0' rust-version: "stable" @@ -36,7 +36,7 @@ jobs: - platform: "windows-latest" args: '--features="cuda,openblas"' pre-build-args: "--cuda --openblas" - name: 'cuda-11.8.0' + name: 'nvidia-11.8.0' cuda-verison: '11.8.0' rust-version: "stable" @@ -111,7 +111,39 @@ jobs: args: ${{ matrix.args }} + - name: Prepare Portable zip + if: contains(matrix.name, 'portable') + run: | + # Get all EXE files in the specified directory + $exe_files = Get-ChildItem -Path "target\release\bundle\nsis\*.exe" + + # Unzip each EXE file and zip the contents + foreach ($file in $exe_files) { + $name = $file.BaseName + $ext = "_portable.zip" + + # Create a new directory for extraction in the same folder + $extract_dir = New-Item -ItemType Directory -Path "$($file.DirectoryName)\$name" + echo $extract_dir.FullName + + try { + # Unzip the EXE file into the new directory + & 7z x $file.FullName -o"$extract_dir" + + # Zip the contents into a new zip file + $zip_name = "{0}{1}" -f $name, $ext + & 7z a "$($file.DirectoryName)\$zip_name" "$extract_dir\*" + + Write-Output "Zipped contents of '$($file.FullName)' to '$zip_name'" + } finally { + # Remove the extraction directory + Remove-Item -Recurse -Force $extract_dir + } + } + shell: pwsh + - name: Rename Installer + if: ${{ !contains(matrix.name, 'portable') }} run: | # Get the list of exe files in the directory $exe_files = Get-ChildItem -Path "target\release\bundle\nsis\*.exe" @@ -136,7 +168,8 @@ jobs: - name: Upload installer if: github.event.inputs.skip-publish != '1' run: | - bun scripts/publish.js target/release/bundle/nsis/*.exe + $filePattern = '${{ matrix.name }}' -match 'portable' ? '*.zip' : '*.exe' + bun scripts/publish.js target/release/bundle/nsis/$filePattern shell: pwsh env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/Cargo.lock b/Cargo.lock index 1cbf9f13..541d7c11 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6273,8 +6273,8 @@ dependencies = [ [[package]] name = "whisper-rs" -version = "0.12.0" -source = "git+https://github.com/tazz4843/whisper-rs.git?rev=f1030ef#f1030ef7626e962caf946927be80b8397ec4b7e4" +version = "0.12.1" +source = "git+https://github.com/thewh1teagle/whisper-rs.git?branch=v1.6.2#03a7578024643dbc85fc9e998daa8e6c9750ca6b" dependencies = [ "tracing", "whisper-rs-sys", @@ -6282,8 +6282,8 @@ dependencies = [ [[package]] name = "whisper-rs-sys" -version = "0.10.0" -source = "git+https://github.com/tazz4843/whisper-rs.git?rev=f1030ef#f1030ef7626e962caf946927be80b8397ec4b7e4" +version = "0.10.1" +source = "git+https://github.com/thewh1teagle/whisper-rs.git?branch=v1.6.2#03a7578024643dbc85fc9e998daa8e6c9750ca6b" dependencies = [ "bindgen", "cfg-if", diff --git a/core/Cargo.toml b/core/Cargo.toml index 6f345bfa..dbc34050 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -9,7 +9,7 @@ path = "src/lib.rs" [dependencies] -whisper-rs = { git = "https://github.com/tazz4843/whisper-rs.git", rev = "f1030ef", features = [ +whisper-rs = { git = "https://github.com/thewh1teagle/whisper-rs.git", branch = "v1.6.2", features = [ "whisper-cpp-tracing", ] } clap = { version = "4.4.13", features = ["derive"] }