Add Windows build for interop crate (hyperium#126)

* Update rust interop test binaries to v1.25.1 * Add Windows build for interop crate
satelit-project · Jan 1, 2020 · 1d11b35 · 1d11b35
1 parent 8b0e605
commit 1d11b35
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -57,7 +57,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macOS-latest]
+        os: [ubuntu-latest, macOS-latest, windows-latest]
         rust: [stable]
 
     env:
@@ -72,6 +72,7 @@ jobs:
       run: rustup component add rustfmt
     - name: Run interop tests
       run: ./tonic-interop/test.sh
+      shell: bash
     - name: Run interop tests with tls
       run: ./tonic-interop/test.sh --use_tls
-
+      shell: bash
diff --git a/tonic-interop/bin/client_darwin_amd64 b/tonic-interop/bin/client_darwin_amd64
diff --git a/tonic-interop/bin/client_linux_amd64 b/tonic-interop/bin/client_linux_amd64
diff --git a/tonic-interop/bin/client_windows_amd64.exe b/tonic-interop/bin/client_windows_amd64.exe
diff --git a/tonic-interop/bin/server_darwin_amd64 b/tonic-interop/bin/server_darwin_amd64
diff --git a/tonic-interop/bin/server_linux_amd64 b/tonic-interop/bin/server_linux_amd64
diff --git a/tonic-interop/bin/server_windows_amd64.exe b/tonic-interop/bin/server_windows_amd64.exe
diff --git a/tonic-interop/test.sh b/tonic-interop/test.sh
@@ -3,16 +3,19 @@
 set -eu
 set -o pipefail
 
+echo "Running for OS: ${OSTYPE}"
+
 case "$OSTYPE" in
-  darwin*)  OS="darwin" ;;
-  linux*)   OS="linux" ;;
+  darwin*)  OS="darwin"; EXT="" ;;
+  linux*)   OS="linux"; EXT="" ;;
+  msys*) OS="windows"; EXT=".exe" ;;
   *)        exit 2 ;;
 esac
 
 cargo build -p tonic-interop --bins
 
 ARG="${1:-""}"
-SERVER="tonic-interop/bin/server_${OS}_amd64"
+SERVER="tonic-interop/bin/server_${OS}_amd64${EXT}"
 
 # TLS_CA="tonic-interop/data/ca.pem"
 TLS_CRT="tonic-interop/data/server1.pem"