Revert "Merge branch 'master' into smart-guess-update-self"

This reverts commit c13ad31, reversing
changes made to fb6a559.

.github/workflows/ci.yaml

@@ -1286,17 +1286,14 @@ jobs:
  # nor run on the rust docker images. This permits a smaller workflow without the
  # templating and so on.
  build-all-features: # job-name
- runs-on: ${{ matrix.os }}
+ runs-on: ubuntu-latest
  if: ${{ contains('["pull_request", "merge_group"]', github.event_name) }}
  strategy:
  fail-fast: false
  matrix:
- include:
- # Might add more targets in future.
- - os: ubuntu-latest
- target: x86_64-unknown-linux-gnu
- - os: windows-latest
- target: x86_64-pc-windows-msvc
+ # Might add more targets in future.
+ target:
+ - x86_64-unknown-linux-gnu
  steps:
  - name: Clone repo
  uses: actions/checkout@v4
@@ -1307,17 +1304,7 @@ jobs:
  with:
  version: "3.x"
  repo-token: ${{ secrets.GITHUB_TOKEN }}
- - name: Install OpenSSL
- if: ${{ contains(matrix.os, 'windows') }}
- run: |
- choco install openssl -y --no-progress
- Get-Command openssl
- openssl version
- echo "OPENSSL_LIB_DIR=C:/Program Files/OpenSSL/lib" >> $env:GITHUB_ENV
- echo "OPENSSL_DIR=C:/Program Files/OpenSSL/" >> $env:GITHUB_ENV
- echo "OPENSSL_INCLUDE_DIR=C:/Program Files/OpenSSL/include" >> $env:GITHUB_ENV
  - name: Set environment variables appropriately for the build
- shell: bash
  run: |
  echo "$HOME/.cargo/bin" >> $GITHUB_PATH
  echo "TARGET=${{ matrix.target }}" >> $GITHUB_ENV
@@ -1327,7 +1314,7 @@ jobs:
  run: cargo install cargo-all-features --git https://github.com/rbtcollins/cargo-all-features.git
  - name: Ensure we have our goal target installed
  run: |
- rustup target install ${{ matrix.target }}
+ rustup target install "$TARGET"
  - name: Build every combination
  env:
  RUSTFLAGS: -D warnings

ci/actions-templates/all-features-template.yaml

@@ -8,17 +8,14 @@ jobs: # skip-all
  # nor run on the rust docker images. This permits a smaller workflow without the
  # templating and so on.
  build-all-features: # job-name
- runs-on: ${{ matrix.os }}
+ runs-on: ubuntu-latest
  if: ${{ contains('["pull_request", "merge_group"]', github.event_name) }}
  strategy:
  fail-fast: false
  matrix:
- include:
- # Might add more targets in future.
- - os: ubuntu-latest
- target: x86_64-unknown-linux-gnu
- - os: windows-latest
- target: x86_64-pc-windows-msvc
+ # Might add more targets in future.
+ target:
+ - x86_64-unknown-linux-gnu
  steps:
  - name: Clone repo
  uses: actions/checkout@v4
@@ -29,17 +26,7 @@ jobs: # skip-all
  with:
  version: "3.x"
  repo-token: ${{ secrets.GITHUB_TOKEN }}
- - name: Install OpenSSL
- if: ${{ contains(matrix.os, 'windows') }}
- run: |
- choco install openssl -y --no-progress
- Get-Command openssl
- openssl version
- echo "OPENSSL_LIB_DIR=C:/Program Files/OpenSSL/lib" >> $env:GITHUB_ENV
- echo "OPENSSL_DIR=C:/Program Files/OpenSSL/" >> $env:GITHUB_ENV
- echo "OPENSSL_INCLUDE_DIR=C:/Program Files/OpenSSL/include" >> $env:GITHUB_ENV
  - name: Set environment variables appropriately for the build
- shell: bash
  run: |
  echo "$HOME/.cargo/bin" >> $GITHUB_PATH
  echo "TARGET=${{ matrix.target }}" >> $GITHUB_ENV
@@ -49,7 +36,7 @@ jobs: # skip-all
  run: cargo install cargo-all-features --git https://github.com/rbtcollins/cargo-all-features.git
  - name: Ensure we have our goal target installed
  run: |
- rustup target install ${{ matrix.target }}
+ rustup target install "$TARGET"
  - name: Build every combination
  env:
  RUSTFLAGS: -D warnings

ci/run.bash

@@ -77,5 +77,5 @@ build_test() {
 if [ -z "$SKIP_TESTS" ]; then
  target_cargo run --features test -- --dump-testament
  build_test build
- RUSTUP_CI=1 build_test test
+ build_test test
 fi

download/Cargo.toml

@@ -9,21 +9,14 @@ default = ["reqwest-backend", "reqwest-rustls-tls", "reqwest-native-tls"]
 curl-backend = ["curl"]
 reqwest-backend = ["reqwest", "env_proxy"]
 reqwest-native-tls = ["reqwest/native-tls", "dep:once_cell"]
-reqwest-rustls-tls = [
- "reqwest/rustls-tls-manual-roots-no-provider",
- "dep:rustls",
- "dep:rustls-platform-verifier",
- "dep:once_cell",
-]
+reqwest-rustls-tls = ["reqwest/rustls-tls-native-roots", "dep:once_cell"]
 
 [dependencies]
 anyhow.workspace = true
 curl = { version = "0.4.44", optional = true }
 env_proxy = { version = "0.4.1", optional = true }
 once_cell = { workspace = true, optional = true }
 reqwest = { version = "0.12", default-features = false, features = ["blocking", "gzip", "socks", "stream"], optional = true }
-rustls = { version = "0.23", optional = true, default-features = false, features = ["logging", "ring", "tls12"] }
-rustls-platform-verifier = { version = "0.3", optional = true }
 thiserror.workspace = true
 tokio = { workspace = true, default-features = false, features = ["sync"] }
 tokio-stream.workspace = true