Skip to content

fix: switch to windows msvc #7080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lifeizhou-ap merged 11 commits into from
Feb 9, 2026
Merged

fix: switch to windows msvc #7080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
54ce2ef
release windows artifact to msvc target
lifeizhou-ap Feb 9, 2026
a830536
testing setup
lifeizhou-ap Feb 9, 2026
6701de9
fix: remove windows_only input that can't access matrix context
lifeizhou-ap Feb 9, 2026
4cc73d9
fix window bundle
lifeizhou-ap Feb 9, 2026
a035415
Merge branch 'main' into lifei/switch-to-windows-msvc
lifeizhou-ap Feb 9, 2026
dd9c935
revert the test setup
lifeizhou-ap Feb 9, 2026
ed77926
removed comments
lifeizhou-ap Feb 9, 2026
924fa5b
fixed with copilot pr comments
lifeizhou-ap Feb 9, 2026
364ae9d
testing
lifeizhou-ap Feb 9, 2026
961491e
Revert "testing"
lifeizhou-ap Feb 9, 2026
289c06e
used proper attribute
lifeizhou-ap Feb 9, 2026
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
133 changes: 23 additions & 110 deletions .github/workflows/build-cli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Platform Build Strategy:
# - Linux: Uses Ubuntu runner with cross-compilation
# - macOS: Uses macOS runner with cross-compilation
# - Windows: Uses Ubuntu runner with Docker cross-compilation (same as desktop build)
# - Windows: Uses Windows runner with native MSVC build
on:
workflow_call:
Comment on lines 10 to 11
Copy link

Copilot AI Feb 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

workflow_dispatch is enabled, so this workflow can now be run directly; please update the header comment that says it “doesn't get triggered on its own” to avoid misleading future maintainers.

Copilot uses AI. Check for mistakes.
Copy link
Copy Markdown
Collaborator Author

@lifeizhou-ap lifeizhou-ap Feb 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

workflow_dispatch: this was for testing. i have removed it after the test

inputs:
Expand Down Expand Up @@ -56,10 +56,9 @@ jobs:
# Windows builds (only x86_64 supported)
- os: windows
architecture: x86_64
target-suffix: pc-windows-gnu
build-on: ubuntu-latest
target-suffix: pc-windows-msvc
build-on: windows-latest
Comment on lines 56 to +60
Copy link

Copilot AI Feb 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that Windows builds run on windows-latest, the earlier Update version in Cargo.toml step will run under PowerShell on Windows (default shell) and its current sed invocation relies on bash-style quoting/concatenation, which will fail when inputs.version is set. Make that version-update step explicitly use shell: bash on Windows (or rewrite it in PowerShell) so tagged/release builds don’t break.

Copilot uses AI. Check for mistakes.
use-cross: false
use-docker: true

steps:
- name: Checkout code
Expand All @@ -70,6 +69,7 @@ jobs:

- name: Update version in Cargo.toml
if: ${{ inputs.version != '' }}
shell: bash
run: |
sed -i.bak 's/^version = ".*"/version = "'${{ inputs.version }}'"/' Cargo.toml
rm -f Cargo.toml.bak
Expand All @@ -85,10 +85,10 @@ jobs:
key: ${{ matrix.architecture }}-${{ matrix.target-suffix }}

- name: Cache Cargo artifacts (Windows)
if: matrix.use-docker
if: matrix.os == 'windows'
uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
with:
key: ${{ matrix.architecture }}-${{ matrix.target-suffix }}
key: windows-msvc-cli

- name: Build CLI (Linux/macOS)
if: matrix.use-cross
Expand All @@ -110,110 +110,28 @@ jobs:
export CC="${{ matrix.cc || ''}}"
cross build --release --target ${TARGET} -p goose-cli

- name: Build CLI (Windows)
if: matrix.use-docker
- name: Setup Rust (Windows)
if: matrix.os == 'windows'
shell: bash
run: |
echo "🚀 Building Windows CLI executable with enhanced GitHub Actions caching..."

# Create cache directories
mkdir -p ~/.cargo/registry ~/.cargo/git

# Use enhanced caching with GitHub Actions cache mounts
docker run --rm \
-v "$(pwd)":/usr/src/myapp \
-v "$HOME/.cargo/registry":/usr/local/cargo/registry \
-v "$HOME/.cargo/git":/usr/local/cargo/git \
-w /usr/src/myapp \
rust:latest \
bash -c "
set -e
echo '=== Setting up Rust environment with caching ==='
export CARGO_HOME=/usr/local/cargo
export PATH=/usr/local/cargo/bin:\$PATH

# Check if Windows target is already installed in cache
if rustup target list --installed | grep -q x86_64-pc-windows-gnu; then
echo '✅ Windows cross-compilation target already installed'
else
echo '📦 Installing Windows cross-compilation target...'
rustup target add x86_64-pc-windows-gnu
fi

echo '=== Setting up build dependencies ==='
apt-get update
apt-get install -y mingw-w64 protobuf-compiler cmake time

echo '=== Setting up cross-compilation environment ==='
export CC_x86_64_pc_windows_gnu=x86_64-w64-mingw32-gcc
export CXX_x86_64_pc_windows_gnu=x86_64-w64-mingw32-g++
export AR_x86_64_pc_windows_gnu=x86_64-w64-mingw32-ar
export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=x86_64-w64-mingw32-gcc
export PKG_CONFIG_ALLOW_CROSS=1
export PROTOC=/usr/bin/protoc

echo '=== Optimized Cargo configuration ==='
mkdir -p .cargo
echo '[build]' > .cargo/config.toml
echo 'jobs = 4' >> .cargo/config.toml
echo '' >> .cargo/config.toml
echo '[target.x86_64-pc-windows-gnu]' >> .cargo/config.toml
echo 'linker = \"x86_64-w64-mingw32-gcc\"' >> .cargo/config.toml
echo '' >> .cargo/config.toml
echo '[net]' >> .cargo/config.toml
echo 'git-fetch-with-cli = true' >> .cargo/config.toml
echo 'retry = 3' >> .cargo/config.toml
echo '' >> .cargo/config.toml
echo '[profile.release]' >> .cargo/config.toml
echo 'codegen-units = 1' >> .cargo/config.toml
echo 'lto = false' >> .cargo/config.toml
echo 'panic = \"abort\"' >> .cargo/config.toml
echo 'debug = false' >> .cargo/config.toml
echo 'opt-level = 2' >> .cargo/config.toml
echo '' >> .cargo/config.toml
echo '[registries.crates-io]' >> .cargo/config.toml
echo 'protocol = \"sparse\"' >> .cargo/config.toml

echo '=== Building with cached dependencies ==='
# Check if we have cached build artifacts
if [ -d target/x86_64-pc-windows-gnu/release/deps ] && [ \"\$(ls -A target/x86_64-pc-windows-gnu/release/deps)\" ]; then
echo '✅ Found cached build artifacts, performing incremental build...'
CARGO_INCREMENTAL=1
else
echo '🔨 No cached artifacts found, performing full build...'
CARGO_INCREMENTAL=0
fi

echo '🔨 Building Windows CLI executable...'
CARGO_INCREMENTAL=\$CARGO_INCREMENTAL \
CARGO_NET_RETRY=3 \
CARGO_HTTP_TIMEOUT=60 \
RUST_BACKTRACE=1 \
cargo build --release --target x86_64-pc-windows-gnu -p goose-cli --jobs 4

echo '=== Copying Windows runtime DLLs ==='
GCC_DIR=\$(ls -d /usr/lib/gcc/x86_64-w64-mingw32/*/ | head -n 1)
cp \"\$GCC_DIR/libstdc++-6.dll\" target/x86_64-pc-windows-gnu/release/
cp \"\$GCC_DIR/libgcc_s_seh-1.dll\" target/x86_64-pc-windows-gnu/release/
cp /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll target/x86_64-pc-windows-gnu/release/

echo '✅ Build completed successfully!'
ls -la target/x86_64-pc-windows-gnu/release/
"
rustup show
rustup target add x86_64-pc-windows-msvc

sudo chown -R $USER:$USER target/
- name: Build CLI (Windows)
if: matrix.os == 'windows'
shell: bash
run: |
echo "🚀 Building Windows CLI executable..."
cargo build --release --target x86_64-pc-windows-msvc -p goose-cli
Comment on lines +113 to +125
Copy link

Copilot AI Feb 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These Windows steps call rustup/cargo without first installing a toolchain (unlike CI which uses actions-rust-lang/setup-rust-toolchain@v1), so the workflow is dependent on whatever happens to be preinstalled on windows-latest; add an explicit Rust toolchain setup step (or activate hermit, if supported) to make builds reproducible and avoid runner-image regressions.

Copilot uses AI. Check for mistakes.

# Verify build succeeded
if [ ! -f "./target/x86_64-pc-windows-gnu/release/goose.exe" ]; then
if [ ! -f "./target/x86_64-pc-windows-msvc/release/goose.exe" ]; then
echo "❌ Windows CLI binary not found."
ls -la ./target/x86_64-pc-windows-gnu/release/ || echo "Release directory doesn't exist"
ls -la ./target/x86_64-pc-windows-msvc/release/ || echo "Release directory doesn't exist"
exit 1
fi

echo "✅ Windows CLI binary found!"
ls -la ./target/x86_64-pc-windows-gnu/release/goose.exe

echo "✅ Windows runtime DLLs:"
ls -la ./target/x86_64-pc-windows-gnu/release/*.dll
ls -la ./target/x86_64-pc-windows-msvc/release/goose.exe

- name: Package CLI (Linux/macOS)
if: matrix.use-cross
Expand All @@ -233,22 +151,17 @@ jobs:
echo "ARTIFACT=target/${TARGET}/release/goose-${TARGET}.tar.bz2" >> $GITHUB_ENV

- name: Package CLI (Windows)
if: matrix.use-docker
if: matrix.os == 'windows'
shell: bash
run: |
export TARGET="${{ matrix.architecture }}-${{ matrix.target-suffix }}"

# Create a directory for the package contents
mkdir -p "target/${TARGET}/release/goose-package"

# Copy the goose binary
cp "target/${TARGET}/release/goose.exe" "target/${TARGET}/release/goose-package/"

# Copy Windows runtime DLLs
cp "target/${TARGET}/release/"*.dll "target/${TARGET}/release/goose-package/"

# Create the zip archive with binary and DLLs
cd "target/${TARGET}/release"
zip -r "goose-${TARGET}.zip" goose-package/
7z a -tzip "goose-${TARGET}.zip" goose-package/
echo "ARTIFACT=target/${TARGET}/release/goose-${TARGET}.zip" >> $GITHUB_ENV

- name: Upload CLI artifact
Expand Down
Loading
Loading