From c070d47f3fb63cd7f6ccda57e374c9cc6429e231 Mon Sep 17 00:00:00 2001
From: jonathanrainer <jonathan.rainer@apollographql.com>
Date: Sun, 14 Jul 2024 08:54:49 +0100
Subject: [PATCH] Add extra fixes for Windows

---
 .github/workflows/smoke-test.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/smoke-test.yml b/.github/workflows/smoke-test.yml
index 98b45fde1..0c65d7f7a 100644
--- a/.github/workflows/smoke-test.yml
+++ b/.github/workflows/smoke-test.yml
@@ -61,8 +61,8 @@ jobs:
             yum -y install perl-core gcc openssl-devel openssl git
             curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
             . "$HOME/.cargo/env"
-            cargo build --target ${{ matrix.compile_target.target }}
-            cargo build --target ${{ matrix.compile_target.target }} -p xtask
+            cargo build
+            cargo build -p xtask
       - if: ${{ matrix.compile_target.container == '' }}
         name: "Build binaries on host"
         run: |
@@ -74,8 +74,8 @@ jobs:
         with:
           name: ${{ matrix.compile_target.target }}
           path: |
-            target/${{ matrix.compile_target.target }}/debug/rover
-            target/${{ matrix.compile_target.target }}/debug/xtask
+            target/${{ matrix.compile_target.target }}/debug/rover*
+            target/${{ matrix.compile_target.target }}/debug/xtask*
           if-no-files-found: error
           retention-days: 5
   smoke_tests:
@@ -113,6 +113,7 @@ jobs:
         name: "Checkout rover repo"
       - uses: actions/download-artifact@v4
         name: "Download artifacts built in previous stages"
+        if: ${{ !contains(matrix.testing_target.binary_under_test, 'windows')}}
       - name: "Set permissions on artifacts correctly"
         run: |
           chmod +x ./${{ matrix.testing_target.binary_under_test }}/{rover,xtask}
@@ -131,6 +132,10 @@ jobs:
         if: ${{ matrix.testing_target.container_to_use == ''}}
         name: "Install volta"
       - name: Run Smoke Tests
-        if: ${{ matrix.testing_target.container_to_use == ''}}
+        if: ${{ matrix.testing_target.container_to_use == '' && !contains(matrix.testing_target.binary_under_test, 'windows')}}
         run: |
           ./${{ matrix.testing_target.binary_under_test }}/xtask smoke  --binary-path ./${{ matrix.testing_target.binary_under_test }}/rover --federation-version "${{ matrix.composition-version }}" --router-version "${{ matrix.router-version }}"
+      - name: Run Smoke Tests (Windows)
+        if: ${{ matrix.testing_target.container_to_use == '' && contains(matrix.testing_target.binary_under_test, 'windows')}}
+        run: |
+          .\${{ matrix.testing_target.binary_under_test }}\xtask.exe smoke  --binary-path .\${{ matrix.testing_target.binary_under_test }}\rover --federation-version "${{ matrix.composition-version }}" --router-version "${{ matrix.router-version }}"
\ No newline at end of file