Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
version: "0.12.0"
enable-cache: false

- uses: dtolnay/rust-toolchain@1.85.0
- uses: dtolnay/rust-toolchain@stable

- name: Restore Rust build cache
uses: actions/cache@v5
Expand All @@ -77,9 +77,9 @@ jobs:
~/.cargo/registry
~/.cargo/git
desktop/src-tauri/target
key: desktop-rust-${{ runner.os }}-${{ runner.arch }}-1.85.0-${{ hashFiles('desktop/src-tauri/Cargo.lock') }}
key: desktop-rust-${{ runner.os }}-${{ runner.arch }}-stable-${{ hashFiles('desktop/src-tauri/Cargo.lock') }}
restore-keys: |
desktop-rust-${{ runner.os }}-${{ runner.arch }}-1.85.0-
desktop-rust-${{ runner.os }}-${{ runner.arch }}-stable-

- name: Install locked desktop tooling
run: npm ci
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/release-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ jobs:
validate-release:
if: needs.release.outputs.released == 'true'
needs: release
permissions:
contents: read
pull-requests: read
uses: ./.github/workflows/ci.yml
with:
checkout_ref: ${{ needs.release.outputs.commit_sha }}
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/release-to-test-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ concurrency:

jobs:
validate:
permissions:
contents: read
pull-requests: read
uses: ./.github/workflows/ci.yml
with:
checkout_ref: ${{ github.sha }}
Expand Down
12 changes: 11 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,20 @@
<strong>Dialogue search · Scene search · Actor grouping</strong>
</p>

<p align="center">
<a href="https://github.com/grayhatdevelopers/vidxp/releases">
<img src="https://img.shields.io/badge/Download-Desktop_app-5865F2?style=for-the-badge&logo=github" alt="Download VidXP desktop app">
</a>
</p>

<p align="center">
Windows · Apple Silicon macOS · Linux
</p>

<p align="center">
<a href="https://pypi.org/project/vidxp/"><img src="https://img.shields.io/pypi/v/vidxp" alt="PyPI version"></a>
<a href="https://github.com/grayhatdevelopers/vidxp/pkgs/container/vidxp"><img src="https://img.shields.io/badge/container-GHCR-blue" alt="GHCR container"></a>
<a href="https://github.com/grayhatdevelopers/vidxp/actions/workflows/ci.yml?query=branch%3Amain"><img src="https://github.com/grayhatdevelopers/vidxp/actions/workflows/ci.yml/badge.svg?branch=main" alt="CI status"></a>
<a href="https://github.com/grayhatdevelopers/vidxp/actions/workflows/release-to-test-pypi.yml?query=branch%3Amain"><img src="https://github.com/grayhatdevelopers/vidxp/actions/workflows/release-to-test-pypi.yml/badge.svg?branch=main" alt="Main prerelease status"></a>
<a href="LICENSE"><img src="https://img.shields.io/github/license/grayhatdevelopers/vidxp" alt="MIT license"></a>
<a href="https://grayhat.studio/discord"><img src="https://img.shields.io/discord/867124708473700363?logo=discord&logoColor=white" alt="Discord"></a>
</p>
Expand Down
1 change: 1 addition & 0 deletions changes/+release-workflow.security.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Restore prerelease and stable-release validation, and update the desktop Rust baseline so patched `time` and `serde_with` releases are used.
3 changes: 3 additions & 0 deletions desktop/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[toolchain]
channel = "stable"
profile = "minimal"
115 changes: 54 additions & 61 deletions desktop/src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions desktop/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "vidxp-desktop"
version = "0.2.1-b.1"
description = "The VidXP desktop launcher and local runtime supervisor"
edition = "2024"
rust-version = "1.85"
rust-version = "1.88"
license = "MIT"

[lib]
Expand All @@ -23,8 +23,8 @@ serde_json = "1.0.151"
sha2 = "0.11.0"
tauri = { version = "2.11.5", features = ["tray-icon"] }
tauri-plugin-log = "2.9.0"
tauri-plugin-dialog = "2.6.0"
tauri-plugin-opener = "2.5.0"
tauri-plugin-dialog = "2.7.2"
tauri-plugin-opener = "2.5.4"
tauri-plugin-shell = "2.3.5"
tauri-plugin-single-instance = "2.4.3"
wait-timeout = "0.2.1"