Merge branch 'master' into update/apalis

.github/workflows/ci-nightly.yml

@@ -59,7 +59,7 @@ jobs:
         timeout-minutes: 10
 
       - name: Install cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.41.7
+        uses: taiki-e/install-action@v2.42.0
         with:
           tool: cargo-ci-cache-clean
 

.github/workflows/ci.yml

@@ -50,7 +50,7 @@ jobs:
           redis-version: 6
 
       - name: cargo test
-        run: cargo test --workspace --all-features --no-fail-fast --exclude=diesel-example -- --nocapture
+        run: cargo test --workspace --all-features --no-fail-fast --exclude=db-diesel -- --nocapture
         timeout-minutes: 30
 
       - name: cargo test (diesel)
@@ -60,11 +60,11 @@ jobs:
           cd databases/diesel
           diesel migration run
           chmod a+rwx test.db
-          cargo test -p=diesel-example --no-fail-fast -- --nocapture
+          cargo test -p=db-diesel --no-fail-fast -- --nocapture
         timeout-minutes: 10
 
       - name: Install cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.41.7
+        uses: taiki-e/install-action@v2.42.0
         with:
           tool: cargo-ci-cache-clean
 

auth/simple-auth-server/README.md

@@ -29,13 +29,12 @@
 - [r2d2](https://crates.io/crates/r2d2) // A generic connection pool.
 - [serde](https://crates.io/crates/serde) // A generic serialization/deserialization framework.
 - [serde_json](https://crates.io/crates/serde_json) // A JSON serialization file format.
-- [serde_derive](https://crates.io/crates/serde_derive) // Macros 1.1 implementation of #[derive(Serialize, Deserialize)].
 - [sparklepost](https://crates.io/crates/sparklepost) // Rust bindings for Sparkpost email API.
 - [uuid](https://crates.io/crates/uuid) // A library to generate and parse UUIDs.
 
 Read the full tutorial series on [gill.net.in](https://gill.net.in)
 
-- [Auth Web Microservice with Rust using Actix Web v2 - Complete Tutorial](https://gill.net.in/posts/auth-microservice-rust-actix-web1.0-diesel-complete-tutorial/)
+- [Auth Web Microservice with Rust using Actix Web v4 - Complete Tutorial](https://gill.net.in/posts/auth-microservice-rust-actix-web1.0-diesel-complete-tutorial/)
 
 ### Dependencies
 

middleware/http-to-https/README.md

@@ -6,7 +6,7 @@ A pre-built solution is soon to be built-in. For now, see [`RedirectHttps`](http
 
 ## This Example
 
-This example is the next step after implementing this example : [Setup TLS via rustls](https://github.com/actix/examples/tree/master/security/rustls).
+This example is the next step after implementing this example : [Setup TLS via rustls](https://github.com/actix/examples/tree/master/https-tls/rustls).
 
 You might have already implemented TLS (using one of the ways mentioned in the example of security section), and have setup your server to listen to port 443 (for HTTPS).
 

websockets/echo/README.md

@@ -19,7 +19,7 @@ cargo run --bin websocket-server
 ### rust client
 
 ```sh
-cd websockets/websocket
+cd websockets/echo
 cargo run --bin websocket-client
 ```