ci: Fix CI

- Use updated windows-gnu and cross - Bump MSRV to v1.63 Signed-off-by: John Nunley <[email protected]>
notgull · Jun 12, 2024 · d4b76aa · d4b76aa
1 parent d6d3138
commit d4b76aa
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 27 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,18 +39,11 @@ jobs:
         target:
           - x86_64-pc-windows-gnu
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Rust
         # --no-self-update is necessary because the windows environment cannot self-update rustup.exe.
         run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
       - run: rustup target add ${{ matrix.target }}
-      # https://github.com/rust-lang/rust/issues/49078
-      - name: Fix windows-gnu rust-mingw
-        run : |
-          for i in crt2.o dllcrt2.o libmingwex.a libmsvcrt.a ; do
-            cp -f "/C/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/x86_64-w64-mingw32/lib/$i" "`rustc --print sysroot`/lib/rustlib/x86_64-pc-windows-gnu/lib"
-          done
-        shell: bash
       - run: cargo build --target ${{ matrix.target }} --all --all-features --all-targets
       - run: cargo test --target ${{ matrix.target }}
 
@@ -61,38 +54,44 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install Rust
       run: rustup update stable
     - name: Install cross
-      uses: taiki-e/install-action@v1
-      with:
-        # https://github.com/cross-rs/cross/issues/724
-        tool: [email protected]
+      uses: taiki-e/install-action@cross
+    # We don't test BSDs, since we already test them in Cirrus.
     - name: Android
       if: startsWith(matrix.os, 'ubuntu')
       run: cross test --target arm-linux-androideabi
-    - name: NetBSD
-      if: startsWith(matrix.os, 'ubuntu')
-      run: cross build --target x86_64-unknown-netbsd
-    - name: FreeBSD
-      if: startsWith(matrix.os, 'ubuntu')
-      run: cross build --target x86_64-unknown-freebsd
     - name: iOS
       if: startsWith(matrix.os, 'macos')
-      run: cross build --target aarch64-apple-ios
-    # - name: illumos
-    #   if: startsWith(matrix.os, 'ubuntu')
-    #   run: cross build --target x86_64-unknown-illumos
+      run: |
+        rustup target add aarch64-apple-ios
+        cross build --target aarch64-apple-ios
+    - name: Linux x32
+      if: startsWith(matrix.os, 'ubuntu')
+      run: |
+        rustup target add x86_64-unknown-linux-gnux32
+        cross check --target x86_64-unknown-linux-gnux32
+    - name: Fuchsia
+      if: startsWith(matrix.os, 'ubuntu')
+      run: |
+        rustup target add x86_64-unknown-fuchsia
+        cargo build --target x86_64-unknown-fuchsia
+    - name: illumos
+      if: startsWith(matrix.os, 'ubuntu')
+      run: |
+        rustup target add x86_64-unknown-illumos
+        cargo build --target x86_64-unknown-illumos
 
   msrv:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         # When updating this, the reminder to update the minimum supported
         # Rust version in Cargo.toml and .clippy.toml.
-        ad_rust: ['1.47']
-        dp_rust: ['1.41']
+        ad_rust: ['1.63']
+        dp_rust: ['1.63']
     steps:
       - uses: actions/checkout@v3
       - name: Install Rust for async-dns

diff --git a/async-dns/Cargo.toml b/async-dns/Cargo.toml
@@ -7,7 +7,7 @@ description = "A simple async DNS resolver"
 license = "MIT OR Apache-2.0"
 homepage = "https://github.com/notgull/async-dns/tree/master/async-dns#readme"
 repository = "https://github.com/notgull/async-dns/tree/master/async-dns"
-rust-version = "1.47"
+rust-version = "1.63"
 keywords = ["dns", "async"]
 categories = ["network-programming", "asynchronous"]
 

diff --git a/dns-protocol/Cargo.toml b/dns-protocol/Cargo.toml
@@ -7,7 +7,7 @@ description = "A DNS protocol implementation in Rust"
 license = "MIT OR Apache-2.0"
 homepage = "https://github.com/notgull/async-dns/tree/master/dns-protocol#readme"
 repository = "https://github.com/notgull/async-dns"
-rust-version = "1.41"
+rust-version = "1.63"
 
 [dependencies]
 memchr = { version = "2.5.0", default-features = false }