Use native-tls rather than rustls by default

printfn · Feb 24, 2024 · 567bb4c · 567bb4c
1 parent 13ed453
commit 567bb4c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -69,7 +69,7 @@ jobs:
 
       - name: Build, get version
         run: |
-          cargo run --release --package fend -- help
+          cargo run --release --no-default-features --features rustls --package fend -- help
           echo "FEND_VERSION=$(cargo metadata --no-deps --format-version 1 | jq -r '.packages | .[0].version')" ${{ matrix.env-command }}
 
         # Only run unit tests on non-Linux platforms since Linux runs
@@ -86,7 +86,8 @@ jobs:
           sudo apt-get install -yq gcc-i686-linux-gnu
           rustup target add i686-unknown-linux-gnu
           export CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER=/usr/bin/i686-linux-gnu-gcc
-          LD_LIBRARY_PATH=/usr/i686-linux-gnu/lib/ cargo test --target i686-unknown-linux-gnu --workspace -- --nocapture --quiet
+          LD_LIBRARY_PATH=/usr/i686-linux-gnu/lib/ cargo test \
+            --target i686-unknown-linux-gnu --no-default-features --features rustls --workspace -- --nocapture --quiet
 
       - name: Generate code coverage
         if: ${{ matrix.platform == 'ubuntu-latest' }}
@@ -161,7 +162,7 @@ jobs:
           rustup target add armv7-unknown-linux-gnueabihf
           sudo apt-get install -yq gcc-arm-linux-gnueabihf
           export CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=/usr/bin/arm-linux-gnueabihf-gcc
-          cargo build --release --package fend --target armv7-unknown-linux-gnueabihf
+          cargo build --release --package fend --no-default-features --features rustls --target armv7-unknown-linux-gnueabihf
 
       - name: Upload artifacts (linux-armv7-gnueabihf)
         uses: actions/upload-artifact@v4
@@ -177,7 +178,7 @@ jobs:
           rustup target add aarch64-unknown-linux-gnu
           sudo apt-get install -yq gcc-aarch64-linux-gnu
           export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=/usr/bin/aarch64-linux-gnu-gcc
-          cargo build --release --package fend --target aarch64-unknown-linux-gnu
+          cargo build --release --package fend --no-default-features --features rustls --target aarch64-unknown-linux-gnu
 
       - name: Upload artifacts (linux-aarch64-gnu)
         uses: actions/upload-artifact@v4
@@ -192,7 +193,7 @@ jobs:
         run: |
           rustup target add x86_64-unknown-linux-musl
           sudo apt-get install -yq musl-tools
-          cargo build --release --package fend --target x86_64-unknown-linux-musl
+          cargo build --release --package fend --no-default-features --features rustls --target x86_64-unknown-linux-musl
 
       - name: Upload artifacts (linux-x86_64-musl)
         uses: actions/upload-artifact@v4

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -27,4 +27,4 @@ windows-sys = { version = "0.52.0", features = ["Win32_Foundation", "Win32_Stora
 [features]
 native-tls = [ "dep:ureq", "dep:native-tls", "ureq/native-tls" ]
 rustls = [ "dep:ureq", "ureq/tls" ]
-default = [ "rustls" ]
+default = [ "native-tls" ]