Merge branch 'master' into session-deadpool_redis-compatibility

actix · Jan 22, 2024 · 30b7402 · 30b7402
2 parents b8b2dee + 1934457
commit 30b7402
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml
@@ -36,7 +36,7 @@ jobs:
           toolchain: nightly
 
       - name: Install cargo-hack and cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.25.2
+        uses: taiki-e/install-action@v2.25.10
         with:
           tool: cargo-hack,cargo-ci-cache-clean
 
@@ -77,7 +77,7 @@ jobs:
           toolchain: nightly
 
       - name: Install cargo-hack and cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.25.2
+        uses: taiki-e/install-action@v2.25.10
         with:
           tool: cargo-hack,cargo-ci-cache-clean
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,7 +49,7 @@ jobs:
           toolchain: ${{ matrix.version.version }}
 
       - name: Install cargo-hack and cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.25.2
+        uses: taiki-e/install-action@v2.25.10
         with:
           tool: cargo-hack,cargo-ci-cache-clean
 
@@ -98,7 +98,7 @@ jobs:
           toolchain: ${{ matrix.version.version }}
 
       - name: Install cargo-hack and cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.25.2
+        uses: taiki-e/install-action@v2.25.10
         with:
           tool: cargo-hack,cargo-ci-cache-clean
 

diff --git a/actix-cors/Cargo.toml b/actix-cors/Cargo.toml
@@ -32,5 +32,5 @@ smallvec = "1"
 
 [dev-dependencies]
 actix-web = { version = "4", default-features = false, features = ["macros"] }
-env_logger = "0.10"
+env_logger = "0.11"
 regex = "1.4"
diff --git a/actix-identity/Cargo.toml b/actix-identity/Cargo.toml
@@ -33,6 +33,6 @@ actix-http = "3"
 actix-web = { version = "4", default-features = false, features = ["macros", "cookies", "secure-cookies"] }
 actix-session = { version = "0.9", features = ["redis-rs-session", "cookie-session"] }
 
-env_logger = "0.10"
+env_logger = "0.11"
 reqwest = { version = "0.11", default-features = false, features = ["cookies", "json"] }
 uuid = { version = "1", features = ["v4"] }
diff --git a/actix-redis/Cargo.toml b/actix-redis/Cargo.toml
@@ -44,5 +44,5 @@ actix-web = { version = "4", default-features = false, optional = true }
 [dev-dependencies]
 actix-test = "0.1.0-beta.12"
 actix-web = { version = "4", default-features = false, features = ["macros"] }
-env_logger = "0.10"
+env_logger = "0.11"
 serde = { version = "1.0.101", features = ["derive"] }
diff --git a/actix-session/Cargo.toml b/actix-session/Cargo.toml
@@ -52,7 +52,7 @@ deadpool-redis = { version = "0.14", optional = true }
 actix-session = { path = ".", features = ["cookie-session", "redis-actor-session", "redis-rs-session"] }
 actix-test = "0.1.0-beta.10"
 actix-web = { version = "4", default-features = false, features = ["cookies", "secure-cookies", "macros"] }
-env_logger = "0.10"
+env_logger = "0.11"
 log = "0.4"
 
 [[example]]

diff --git a/actix-settings/Cargo.toml b/actix-settings/Cargo.toml
@@ -26,4 +26,4 @@ toml = "0.8"
 
 [dev-dependencies]
 actix-web = "4"
-env_logger = "0.10"
+env_logger = "0.11"