diff --git a/.github/workflows/build-cli.yml b/.github/workflows/build-cli.yml index 17c9d27abd..ba7b022550 100644 --- a/.github/workflows/build-cli.yml +++ b/.github/workflows/build-cli.yml @@ -63,12 +63,6 @@ jobs: build-on: windows-latest use-cross: false variant: standard - - os: windows - architecture: x86_64 - target-suffix: pc-windows-msvc - build-on: windows-latest - use-cross: false - variant: cuda steps: - name: Checkout code diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index a4c38a9621..727a87a308 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -111,21 +111,13 @@ jobs: version: ${{ needs.prepare-version.outputs.version }} signing: false - bundle-desktop-windows-cuda: - needs: [prepare-version] - uses: ./.github/workflows/bundle-desktop-windows.yml - with: - version: ${{ needs.prepare-version.outputs.version }} - signing: false - windows_variant: cuda - # ------------------------------------ # 7) Create/Update GitHub Release # ------------------------------------ release: name: Release runs-on: ubuntu-latest - needs: [build-cli, install-script, bundle-desktop, bundle-desktop-intel, bundle-desktop-linux, bundle-desktop-windows, bundle-desktop-windows-cuda] + needs: [build-cli, install-script, bundle-desktop, bundle-desktop-intel, bundle-desktop-linux, bundle-desktop-windows] permissions: contents: write id-token: write # Required for Sigstore OIDC signing diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fb3186aa19..dfb5c6b916 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -85,24 +85,13 @@ jobs: signing: true secrets: inherit - bundle-desktop-windows-cuda: - uses: ./.github/workflows/bundle-desktop-windows.yml - permissions: - id-token: write - contents: read - actions: read - with: - signing: true - windows_variant: cuda - secrets: inherit - # ------------------------------------ # 7) Create/Update GitHub Release # ------------------------------------ release: name: Release runs-on: ubuntu-latest - needs: [build-cli, install-script, bundle-desktop, bundle-desktop-intel, bundle-desktop-linux, bundle-desktop-windows, bundle-desktop-windows-cuda] + needs: [build-cli, install-script, bundle-desktop, bundle-desktop-intel, bundle-desktop-linux, bundle-desktop-windows] permissions: contents: write id-token: write # Required for Sigstore OIDC signing diff --git a/crates/goose-cli/src/commands/update.rs b/crates/goose-cli/src/commands/update.rs index 6cf2ba9371..5b82d6aff3 100644 --- a/crates/goose-cli/src/commands/update.rs +++ b/crates/goose-cli/src/commands/update.rs @@ -26,11 +26,7 @@ fn asset_name() -> &'static str { { "goose-aarch64-unknown-linux-gnu.tar.bz2" } - #[cfg(all(target_os = "windows", target_arch = "x86_64", feature = "cuda"))] - { - "goose-x86_64-pc-windows-msvc-cuda.zip" - } - #[cfg(all(target_os = "windows", target_arch = "x86_64", not(feature = "cuda")))] + #[cfg(all(target_os = "windows", target_arch = "x86_64"))] { "goose-x86_64-pc-windows-msvc.zip" } @@ -558,6 +554,12 @@ mod tests { assert!(name.ends_with(".tar.bz2")); } + #[cfg(all(target_os = "windows", target_arch = "x86_64"))] + #[test] + fn test_windows_updates_use_standard_asset() { + assert_eq!(asset_name(), "goose-x86_64-pc-windows-msvc.zip"); + } + #[test] fn test_binary_name() { let name = binary_name();