improve and fix CI (#45)

Author: LuckyTurtleDev

.github/workflows/rust.yml

@@ -7,42 +7,64 @@ on:
     types: [released]
 
 jobs:
+
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+        id: "rust-toolchain"
+      - name: install cargo-hack
+        uses: taiki-e/install-action@cargo-hack
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/git
+            ~/.cargo/registry
+            target
+          key: "${{runner.os}} Rust check ${{steps.rust-toolchain.outputs.cachekey}} Lock ${{hashFiles('Cargo.lock')}}"
+      - run: cargo hack check --feature-powerset --at-least-one-of aws-lc-rs,ring --locked
+        env:
+          RUST_BACKTRACE: 1
+
   test:
+    needs: [check]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: sudo apt-get update -y && sudo apt-get install -y knot-dnsutils
       - uses: dtolnay/rust-toolchain@stable
         id: "rust-toolchain"
       - name: install cargo-hack
         uses: taiki-e/install-action@cargo-hack
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/git
             ~/.cargo/registry
             target
-          key: "${{runner.os}} Rust ${{steps.rust-toolchain.outputs.cachekey}} Lock ${{hashFiles('Cargo.lock')}}"
-      - run: cargo hack test --feature-powerset --at-least-one-of aws-lc-rs,ring --locked -- --include-ignored
+          key: "${{runner.os}} Rust test ${{steps.rust-toolchain.outputs.cachekey}} Lock ${{hashFiles('Cargo.lock')}}"
+      - run: cargo hack test --feature-powerset --at-least-one-of aws-lc-rs,ring --mutually-exclusive-features aws-lc-rs,ring --skip __debug_parser,default,native-roots,webpki-roots --locked -- --include-ignored
         env:
           RUST_BACKTRACE: 1
 
   rustfmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@nightly
         with:
           components: rustfmt
       - run: cargo fmt --all -- --check
 
   benchmark:
+    needs: [check]
     name: bench
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@nightly
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/git
@@ -57,7 +79,7 @@ jobs:
     needs: [test]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - uses: msrd0/cargo-publish-action@v1
         with: 
@@ -75,26 +97,26 @@ jobs:
     runs-on: ubuntu-latest
     needs: [test]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         id: "rust-toolchain"
       - name: install cross
         uses: baptiste0928/cargo-install@v2
         with:
           crate: cross
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/git
             ~/.cargo/registry
             target
           key: "${{runner.os}} Target ${{ matrix.target }} Rust ${{steps.rust-toolchain.outputs.cachekey}} Lock ${{hashFiles('Cargo.lock')}}"
-      - run: cross build --release --locked --no-default-features --features ${{ matrix.roots }} --target ${{ matrix.target }}
+      - run: cross build --release --locked --no-default-features --features ring,${{ matrix.roots }} --target ${{ matrix.target }}
         env:
           RUST_BACKTRACE: 1
       - run: tree
       - name: 'Upload Artifact'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "${{ matrix.target }}--${{ matrix.roots }}"
           path: |
@@ -110,21 +132,21 @@ jobs:
     name: x86_64-apple-darwin--${{ matrix.roots }}
     needs: [test]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         id: "rust-toolchain"
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/git
             ~/.cargo/registry
             target
           key: "${{runner.os}} Rust ${{steps.rust-toolchain.outputs.cachekey}} Lock ${{hashFiles('Cargo.lock')}}"
-      - run: cargo build --release --all-features
+      - run: cargo build --release --features ring,${{ matrix.roots }}
         env:
           RUST_BACKTRACE: 1
       - name: 'Upload Artifact'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "x86_64-apple-darwin--${{ matrix.roots }}"
           path: target/release/crab-hole
@@ -134,8 +156,8 @@ jobs:
     needs: [cross_build]
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
-    - uses: actions/download-artifact@v3
+      uses: actions/checkout@v4
+    - uses: actions/download-artifact@v4
       with:
         path: github_artifacts
     - name: docker
@@ -151,8 +173,8 @@ jobs:
     if: ${{ github.event_name == 'release' }}
     steps:
     - name: Checkout repository #needed to get github.event.release.tag_name 
-      uses: actions/checkout@v3
-    - uses: actions/download-artifact@v3
+      uses: actions/checkout@v4
+    - uses: actions/download-artifact@v4
       with:
         path: github_artifacts
     - name: Upload Release Artifacts

Cargo.toml

@@ -16,7 +16,7 @@ include = [
 ]
 
 [features]
-default = ["native-roots", "aws-lc-rs"]
+default = ["native-roots", "ring"]
 native-roots = ["hickory-resolver/rustls-platform-verifier", "reqwest/rustls-tls-native-roots"]
 webpki-roots = ["hickory-resolver/webpki-roots", "reqwest/rustls-tls-webpki-roots"]
 ring = ["hickory-server/dnssec-ring", "hickory-server/tls-ring", "hickory-server/https-ring", "hickory-server/quic-ring", "hickory-server/h3-ring"]