Skip to content
Closed
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
4 changes: 2 additions & 2 deletions .github/workflows/formal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ jobs:
cache-bin: "false"
cache-workspace-crates: "true"
cache-on-failure: "true"
cmd-format: nix develop .#ci --quiet -c {0}
cmd-format: nix develop .#default --quiet -c {0}
- name: Explore lifecycle interleavings with Shuttle
run: nix develop .#ci --quiet --command cargo test -p wisp-lifecycle --test shuttle_lifecycle
run: nix develop .#default --quiet --command cargo test -p wisp-lifecycle --test shuttle_lifecycle
64 changes: 58 additions & 6 deletions .github/workflows/nix.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: nix
on:
pull_request:
paths:
- "flake.lock"
- "flake.nix"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-nix
cancel-in-progress: true
Expand All @@ -13,10 +10,65 @@ permissions:
id-token: write
jobs:
check:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
runs-on:
- ubuntu-latest
- macos-latest
runs-on: ${{ matrix.runs-on }}
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- uses: ./.github/actions/setup-nix
- uses: DeterminateSystems/flake-checker-action@de924abd783455e8429c858962b9e43062d19da1 # v13
- run: nix develop .#ci --quiet --command nixfmt --check flake.nix nix
- run: |
sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
xcrun swift --version
xcrun --find metal
if: runner.os == 'macOS'
- run: nix flake check --print-build-logs

windows-check:
runs-on: windows-latest
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- run: rustup show
- uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
with:
cache-workspace-crates: "true"
cache-on-failure: "true"

# Keep the Windows-only WASAPI and WinRT recognizer paths type-checked;
# the ordinary Linux job cannot see code behind cfg(target_os).
- run: cargo clippy -p wisp-audiokit --all-targets -- -D warnings
- run: cargo test -p wisp-audiokit --all-targets
- run: cargo test --manifest-path vendor/wasapi/Cargo.toml --lib
- run: cargo test -p wisp-desktop --all-targets

windows-release:
runs-on: windows-latest
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- run: rustup show
- uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
with:
cache-workspace-crates: "true"
cache-on-failure: "true"

- name: Build Windows binaries
run: cargo build -p wisp-desktop -p wisp-mcp --release --locked

- name: Stage Windows artifact
shell: pwsh
run: |
New-Item -ItemType Directory -Force dist/wisp-windows | Out-Null
Copy-Item target/release/wisp-desktop.exe dist/wisp-windows/
Copy-Item target/release/wisp-mcp.exe dist/wisp-windows/
Copy-Item README.md dist/wisp-windows/

- name: Upload Windows artifact
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
with:
name: wisp-windows-x86_64-${{ github.sha }}
path: dist/wisp-windows
if-no-files-found: error
retention-days: 14
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ jobs:
cache-bin: "false"
cache-workspace-crates: "true"
cache-on-failure: "true"
cmd-format: nix develop .#ci --quiet -c {0}
cmd-format: nix develop .#default --quiet -c {0}

- name: Build Wisp binaries (release)
run: nix develop .#ci --quiet --command cargo build -p wisp-desktop -p wisp-mcp --release --locked
run: nix develop .#default --quiet --command cargo build -p wisp-desktop -p wisp-mcp --release --locked

- name: Assemble Wisp.app bundle
run: |
Expand Down
47 changes: 0 additions & 47 deletions .github/workflows/rust-macos.yaml

This file was deleted.

54 changes: 0 additions & 54 deletions .github/workflows/rust-windows.yaml

This file was deleted.

34 changes: 0 additions & 34 deletions .github/workflows/rust.yaml

This file was deleted.

23 changes: 0 additions & 23 deletions .github/workflows/swift.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/version-bump.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
# Sync the local crate versions in Cargo.lock without touching any
# third-party pins. `--workspace` limits the update to the workspace
# members, whose versions are inherited from the value we just set.
nix develop .#ci --quiet --command cargo update --workspace
nix develop .#default --quiet --command cargo update --workspace

echo "--- Cargo.toml [workspace.package] ---"
grep -n 'version' Cargo.toml | tail -1
Expand Down
9 changes: 6 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ resolver = "3"
exclude = ["vendor/wasapi"]

[workspace.dependencies]
chrono = { version = "0.4.45", default-features = false, features = ["clock", "std"] }
chrono = { version = "0.4.45", default-features = false, features = [
"clock",
"std",
] }
crossbeam-channel = "0.5.15"
gpui = "0.2.2"
rusqlite = { version = "0.40.0", features = ["bundled", "chrono"] }
Expand Down Expand Up @@ -41,8 +44,8 @@ pedantic = { level = "deny", priority = -1 }
# names). Kept at `warn` because two of its lints are environmental rather
# than code issues and are opted out below.
cargo = { level = "warn", priority = -1 }
cargo_common_metadata = "allow" # every crate is `publish = false`
multiple_crate_versions = "allow" # decided by the lockfile, not our code
cargo_common_metadata = "allow" # every crate is `publish = false`
multiple_crate_versions = "allow" # decided by the lockfile, not our code

# Restriction lints promoted to hard errors. Test code is exempted from the
# panicking ones via .clippy.toml (allow-{unwrap,expect,panic}-in-tests).
Expand Down
1 change: 1 addition & 0 deletions apps/wisp-desktop/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[package]
name = "wisp-desktop"
description = ""
edition.workspace = true
version.workspace = true
publish = false
Expand Down
Loading
Loading