From c706b4d75b314cdbdc41a34067c1e42aa5a8b3ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 17:50:02 +0000 Subject: [PATCH 1/6] Bump actix-http from 3.4.0 to 3.5.1 Bumps [actix-http](https://github.com/actix/actix-web) from 3.4.0 to 3.5.1. - [Release notes](https://github.com/actix/actix-web/releases) - [Changelog](https://github.com/actix/actix-web/blob/master/CHANGES.md) - [Commits](https://github.com/actix/actix-web/compare/http-v3.4.0...http-v3.5.1) --- updated-dependencies: - dependency-name: actix-http dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 13 ++++++------- Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9cfd7dd9..486d5be6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -153,9 +153,9 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.4.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92ef85799cba03f76e4f7c10f533e66d87c9a7e7055f3391f09000ad8351bc9" +checksum = "129d4c88e98860e1758c5de288d1632b07970a16d59bdf7b8d66053d582bb71f" dependencies = [ "actix-codec", "actix-rt", @@ -9234,20 +9234,19 @@ checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" [[package]] name = "zstd" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "6.0.6" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" dependencies = [ - "libc", "zstd-sys", ] diff --git a/Cargo.toml b/Cargo.toml index 64b38853..6746d533 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -79,7 +79,7 @@ actix-broker = "0.4" actix-codec = "0.5" actix-cors = "0.6" actix-files = "0.6" -actix-http = "3.4" +actix-http = "3.5" actix-identity = "0.6" actix-multipart = "0.6" actix-multipart-derive = "0.6" From 7146f8e31c1a79d398545dc66e11b3b46c0b3566 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 17:50:22 +0000 Subject: [PATCH 2/6] Bump deadpool-postgres from 0.11.0 to 0.12.1 Bumps [deadpool-postgres](https://github.com/bikeshedder/deadpool) from 0.11.0 to 0.12.1. - [Changelog](https://github.com/bikeshedder/deadpool/blob/master/CHANGELOG.md) - [Commits](https://github.com/bikeshedder/deadpool/compare/deadpool-postgres-v0.11.0...deadpool-postgres-v0.12.1) --- updated-dependencies: - dependency-name: deadpool-postgres dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- databases/postgres/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9cfd7dd9..e3b1e326 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2617,9 +2617,9 @@ dependencies = [ [[package]] name = "deadpool-postgres" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40b75ba49590d27f677d3bebaf76cd15889ca8b308bc7ba99bfa25f1d7269c13" +checksum = "bda39fa1cfff190d8924d447ad04fd22772c250438ca5ce1dfb3c80621c05aaa" dependencies = [ "deadpool", "serde", diff --git a/databases/postgres/Cargo.toml b/databases/postgres/Cargo.toml index 81f0e281..c277a533 100644 --- a/databases/postgres/Cargo.toml +++ b/databases/postgres/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] actix-web.workspace = true config = "0.13" -deadpool-postgres = { version = "0.11", features = ["serde"] } +deadpool-postgres = { version = "0.12", features = ["serde"] } derive_more.workspace = true dotenvy.workspace = true serde = { version = "1.0.137", features = ["derive"] } From 401119cc2f6db57865e405e0c3875aa07f57d406 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 17:50:45 +0000 Subject: [PATCH 3/6] Bump openssl from 0.10.60 to 0.10.62 Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.60 to 0.10.62. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.60...openssl-v0.10.62) --- updated-dependencies: - dependency-name: openssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9cfd7dd9..88303ffb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5215,9 +5215,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.60" +version = "0.10.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" +checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" dependencies = [ "bitflags 2.4.1", "cfg-if 1.0.0", @@ -5247,9 +5247,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.96" +version = "0.9.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" +checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index 64b38853..07ec5c3e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -100,7 +100,7 @@ dotenvy = "0.15" env_logger = "0.10" futures-util = { version = "0.3.17", default-features = false, features = ["std"] } log = "0.4" -openssl = { version = "0.10.60", features = ["v110"] } +openssl = { version = "0.10.62", features = ["v110"] } rand = "0.8" rustls = "0.21" serde = { version = "1", features = ["derive"] } From f54f7a10ae21f5fac70d3fdb8967e6fc442f178e Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Mon, 25 Dec 2023 19:32:11 +0000 Subject: [PATCH 4/6] revert openssl dep req change --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 07ec5c3e..64b38853 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -100,7 +100,7 @@ dotenvy = "0.15" env_logger = "0.10" futures-util = { version = "0.3.17", default-features = false, features = ["std"] } log = "0.4" -openssl = { version = "0.10.62", features = ["v110"] } +openssl = { version = "0.10.60", features = ["v110"] } rand = "0.8" rustls = "0.21" serde = { version = "1", features = ["derive"] } From d62733014a8745727aa1e67009777523b55f9b15 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Mon, 25 Dec 2023 21:13:28 +0000 Subject: [PATCH 5/6] ci: run on merge groups --- .github/workflows/linux.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 90048592..c73940e2 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -3,6 +3,8 @@ name: CI (Linux) on: pull_request: types: [opened, synchronize, reopened] + merge_group: + types: [checks_requested] push: branches: [master] From 3b138765e06294558fa7f837dcd6542aacb745da Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Tue, 26 Dec 2023 03:48:23 +0000 Subject: [PATCH 6/6] ci: use faster ci cache cleaning --- .github/workflows/{linux.yml => ci.yml} | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) rename .github/workflows/{linux.yml => ci.yml} (89%) diff --git a/.github/workflows/linux.yml b/.github/workflows/ci.yml similarity index 89% rename from .github/workflows/linux.yml rename to .github/workflows/ci.yml index c73940e2..c474017c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/ci.yml @@ -63,5 +63,10 @@ jobs: cargo test -p=diesel-example --no-fail-fast -- --nocapture timeout-minutes: 10 - - name: Clear the cargo caches - run: cargo install cargo-cache --version=0.8.3 --no-default-features --features=ci-autoclean && cargo-cache + - name: Install cargo-ci-cache-clean + uses: taiki-e/install-action@v2.23.2 + with: + tool: cargo-ci-cache-clean + + - name: CI cache clean + run: cargo-ci-cache-clean