fix windows and CI

Author: magiclen

.github/workflows/ci-version.yml

@@ -24,6 +24,11 @@ jobs:
     name: Test ${{ matrix.toolchain }} on ${{ matrix.os }} to ${{ matrix.target }}
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Install musl-tools (Linux)
+        run: |
+          sudo apt update
+          sudo apt install musl-tools
+        if: matrix.target == 'x86_64-unknown-linux-musl'
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
@@ -40,8 +45,8 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - windows-latest
           - macos-latest
+          - windows-latest
         toolchain:
           - stable
           - nightly

.github/workflows/ci.yml

@@ -45,6 +45,11 @@ jobs:
     name: Test ${{ matrix.toolchain }} on ${{ matrix.os }} to ${{ matrix.target }}
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Install musl-tools (Linux)
+        run: |
+          sudo apt update
+          sudo apt install musl-tools
+        if: matrix.target == 'x86_64-unknown-linux-musl'
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
@@ -61,8 +66,8 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - windows-latest
           - macos-latest
+          - windows-latest
         toolchain:
           - stable
           - nightly

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wait-service"
-version = "0.1.3"
+version = "0.1.4"
 authors = ["Magic Len <len@magiclen.org>"]
 edition = "2021"
 repository = "https://github.com/magiclen/wait-service"

src/main.rs

@@ -9,11 +9,13 @@ extern crate dnsclient;
 
 use std::error::Error;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
-use std::path::Path;
 use std::process::{self, Command};
 use std::str::FromStr;
 use std::time::Duration;
 
+#[cfg(unix)]
+use std::path::Path;
+
 #[cfg(unix)]
 use tokio::net::UnixStream;
 
@@ -55,26 +57,21 @@ async fn tcp(
         let ips = match IpAddr::from_str(host) {
             Ok(ip) => vec![SocketAddr::new(ip, port)],
             Err(_) => {
+                let dns_servers = vec![
+                    UpstreamServer::new(SocketAddr::new(IpAddr::V4(Ipv4Addr::new(1, 1, 1, 1)), 53)),
+                    UpstreamServer::new(SocketAddr::new(IpAddr::V4(Ipv4Addr::new(8, 8, 8, 8)), 53)),
+                    UpstreamServer::new(SocketAddr::new(IpAddr::V4(Ipv4Addr::new(4, 4, 4, 4)), 53)),
+                ];
+
+                #[cfg(unix)]
                 let client = match DNSClient::new_with_system_resolvers() {
                     Ok(client) => client,
-                    Err(_) => {
-                        DNSClient::new(vec![
-                            UpstreamServer::new(SocketAddr::new(
-                                IpAddr::V4(Ipv4Addr::new(1, 1, 1, 1)),
-                                53,
-                            )),
-                            UpstreamServer::new(SocketAddr::new(
-                                IpAddr::V4(Ipv4Addr::new(8, 8, 8, 8)),
-                                53,
-                            )),
-                            UpstreamServer::new(SocketAddr::new(
-                                IpAddr::V4(Ipv4Addr::new(4, 4, 4, 4)),
-                                53,
-                            )),
-                        ])
-                    }
+                    Err(_) => DNSClient::new(dns_servers),
                 };
 
+                #[cfg(windows)]
+                let client = DNSClient::new(dns_servers);
+
                 let host_with_port = format!("{}:{}", host, port);
 
                 client