From 12f3ae9514fab97a205859005a961840f64c034a Mon Sep 17 00:00:00 2001
From: Lewin Bormann <lewin@lewin-bormann.info>
Date: Tue, 11 Jun 2024 21:05:09 +0200
Subject: [PATCH 1/2] Update Github actions configuration

---
 .github/workflows/test.yml | 17 ++++-------------
 Cargo.toml                 |  1 -
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 28194c0a..b1ec5c5f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        features: ["service_account,hyper-rustls", "service_account,hyper-tls", "service_account,hyper-rustls,hyper-tls", "service_account","hyper-rustls","hyper-tls"]
+        features: ["service_account,hyper-rustls", "service_account", "hyper-rustls"]
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
@@ -17,10 +17,7 @@ jobs:
           toolchain: stable
           profile: minimal
           default: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --no-default-features --features=${{ matrix.features }}
+      - run: cargo test --no-default-features --features ${{ matrix.features }}
 
   doc:
     name: yup-oauth2
@@ -32,10 +29,7 @@ jobs:
           toolchain: nightly
           profile: minimal
           default: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: doc
-          args: --all-features
+      - run: cargo doc --no-deps
         env:
           RUSTDOCFLAGS: --cfg yup_oauth2_docsrs
 
@@ -49,7 +43,4 @@ jobs:
           toolchain: stable
           profile: minimal
           default: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: -- --check
+      - run: cargo fmt -- --check
diff --git a/Cargo.toml b/Cargo.toml
index cc774b36..eda42ad2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,7 +40,6 @@ http-body-util = "0.1"
 hyper = "1"
 hyper-util = { version = "0.1.5", features = ["client-legacy", "server-auto", "http1", "http2", "server-graceful"] }
 hyper-rustls = { version = "0.27", optional = true, default-features = false, features = ["http1", "http2", "rustls-native-certs", "ring"] }
-hyper-tls = { version = "0.6.0", optional = true }
 log = "0.4"
 percent-encoding = "2"
 rustls = { version = "^0.23", optional = true, features = ["ring"] }

From 206651d31fb2be8ffde178e51aa4e285df2a8e38 Mon Sep 17 00:00:00 2001
From: Lewin Bormann <lewin@lewin-bormann.info>
Date: Wed, 12 Jun 2024 18:52:53 +0200
Subject: [PATCH 2/2] Update action versions for CI

---
 .github/workflows/test.yml | 22 ++++++++--------------
 Cargo.toml                 |  1 +
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b1ec5c5f..506e4c6e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,27 +9,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        features: ["service_account,hyper-rustls", "service_account", "hyper-rustls"]
+        features: ["service_account,hyper-rustls", "service_account,hyper-tls", "service_account", "hyper-rustls"]
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
-          profile: minimal
-          default: true
       - run: cargo test --no-default-features --features ${{ matrix.features }}
 
   doc:
     name: yup-oauth2
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: nightly
-          profile: minimal
-          default: true
-      - run: cargo doc --no-deps
+      - run: cargo doc --no-deps --all-features
         env:
           RUSTDOCFLAGS: --cfg yup_oauth2_docsrs
 
@@ -37,10 +33,8 @@ jobs:
     name: yup-oauth2
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
-          profile: minimal
-          default: true
       - run: cargo fmt -- --check
diff --git a/Cargo.toml b/Cargo.toml
index eda42ad2..cc774b36 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,6 +40,7 @@ http-body-util = "0.1"
 hyper = "1"
 hyper-util = { version = "0.1.5", features = ["client-legacy", "server-auto", "http1", "http2", "server-graceful"] }
 hyper-rustls = { version = "0.27", optional = true, default-features = false, features = ["http1", "http2", "rustls-native-certs", "ring"] }
+hyper-tls = { version = "0.6.0", optional = true }
 log = "0.4"
 percent-encoding = "2"
 rustls = { version = "^0.23", optional = true, features = ["ring"] }