From 3305e74ee0f983f7c68ad17e093c95355c19b6a4 Mon Sep 17 00:00:00 2001 From: Cameron Garnham Date: Sun, 15 Oct 2023 21:03:03 +0200 Subject: [PATCH 1/4] ci: fix workflows --- .github/workflows/container.yaml | 6 +++--- .github/workflows/deployment.yaml | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/container.yaml b/.github/workflows/container.yaml index 884a1584..84ac4200 100644 --- a/.github/workflows/container.yaml +++ b/.github/workflows/container.yaml @@ -36,13 +36,13 @@ jobs: push: false load: true target: ${{ matrix.target }} - tags: torrust-tracker:local + tags: torrust-index:local cache-from: type=gha cache-to: type=gha - id: inspect name: Inspect - run: docker image inspect torrust-tracker:local + run: docker image inspect torrust-index:local - id: checkout name: Checkout Repository @@ -66,7 +66,7 @@ jobs: - id: check name: Check Context run: | - if [[ "${{ github.repository }}" == "torrust/torrust-tracker" ]]; then + if [[ "${{ github.repository }}" == "torrust/torrust-index" ]]; then if [[ "${{ github.event_name }}" == "push" ]]; then if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then diff --git a/.github/workflows/deployment.yaml b/.github/workflows/deployment.yaml index 30b6d5de..4c7636d9 100644 --- a/.github/workflows/deployment.yaml +++ b/.github/workflows/deployment.yaml @@ -25,6 +25,10 @@ jobs: with: toolchain: ${{ matrix.toolchain }} + - id: imdl + name: Install Intermodal + run: cargo install imdl + - id: test name: Run Unit Tests run: cargo test --tests --benches --examples --workspace --all-targets --all-features From 7fa6215d483309034eea1edd6ef81689f76222ea Mon Sep 17 00:00:00 2001 From: Cameron Garnham Date: Sun, 15 Oct 2023 21:03:49 +0200 Subject: [PATCH 2/4] chore: bump development version --- Cargo.lock | 4 ++-- Cargo.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index edf34580..a8ca31de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2998,7 +2998,7 @@ dependencies = [ [[package]] name = "torrust-index" -version = "3.0.0-alpha.1-develop" +version = "3.0.0-alpha.2-develop" dependencies = [ "argon2", "async-trait", @@ -3046,7 +3046,7 @@ dependencies = [ [[package]] name = "torrust-index-located-error" -version = "3.0.0-alpha.1-develop" +version = "3.0.0-alpha.2-develop" dependencies = [ "log", "thiserror", diff --git a/Cargo.toml b/Cargo.toml index 4d929082..36aeea0e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ license = "AGPL-3.0-only" publish = true repository = "https://github.com/torrust/torrust-tracker" rust-version = "1.72" -version = "3.0.0-alpha.1-develop" +version = "3.0.0-alpha.2-develop" [profile.dev.package.sqlx-macros] opt-level = 3 @@ -68,7 +68,7 @@ text-to-png = "0" thiserror = "1" tokio = { version = "1", features = ["fs", "io-util", "macros", "net", "rt-multi-thread", "signal", "sync", "time"] } toml = "0" -torrust-index-located-error = { version = "3.0.0-alpha.1-develop", path = "packages/located-error" } +torrust-index-located-error = { version = "3.0.0-alpha.2-develop", path = "packages/located-error" } tower-http = { version = "0", features = ["compression-full", "cors"] } urlencoding = "2" uuid = { version = "1", features = ["v4"] } From 9bea63470ac65821c4e95adac07bd4b3b4479a8e Mon Sep 17 00:00:00 2001 From: Cameron Garnham Date: Sun, 15 Oct 2023 21:05:10 +0200 Subject: [PATCH 3/4] chore: update cargo lockfile --- Cargo.lock | 115 +++++++++++++++++++++++++---------------------------- 1 file changed, 54 insertions(+), 61 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a8ca31de..021b3a47 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -133,9 +133,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", @@ -362,6 +362,16 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "chumsky" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23170228b96236b5a7299057ac284a321457700bc8c41a4476052f0f4ba5349d" +dependencies = [ + "hashbrown 0.12.3", + "stacker", +] + [[package]] name = "colored" version = "2.0.4" @@ -629,15 +639,6 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - [[package]] name = "fastrand" version = "2.0.1" @@ -1093,16 +1094,6 @@ dependencies = [ "cc", ] -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.4.0" @@ -1150,15 +1141,6 @@ dependencies = [ "hashbrown 0.14.1", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - [[package]] name = "ipnet" version = "2.8.0" @@ -1260,20 +1242,21 @@ dependencies = [ [[package]] name = "lettre" -version = "0.10.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bd09637ae3ec7bd605b8e135e757980b3968430ff2b1a4a94fb7769e50166d" +checksum = "d47084ad58f99c26816d174702f60e873f861fcef3f9bd6075b4ad2dd72d07d5" dependencies = [ "async-trait", "base64 0.21.4", + "chumsky", "email-encoding", "email_address", - "fastrand 1.9.0", + "fastrand", "futures-io", "futures-util", "hostname", "httpdate", - "idna 0.3.0", + "idna", "mime", "native-tls", "nom", @@ -1281,10 +1264,11 @@ dependencies = [ "quoted_printable", "rustls", "rustls-pemfile", - "socket2 0.4.9", + "socket2 0.5.4", "tokio", "tokio-native-tls", "tokio-rustls", + "url", "webpki-roots", ] @@ -1835,6 +1819,15 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + [[package]] name = "quote" version = "1.0.33" @@ -1846,9 +1839,9 @@ dependencies = [ [[package]] name = "quoted_printable" -version = "0.4.8" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3866219251662ec3b26fc217e3e05bf9c4f84325234dfb96bf0bf840889e49" +checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" [[package]] name = "rand" @@ -1897,9 +1890,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87" +checksum = "aaac441002f822bc9705a681810a4dd2963094b9ca0ddc41cb963a4c189189ea" dependencies = [ "aho-corasick", "memchr", @@ -1909,9 +1902,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" +checksum = "5011c7e263a695dc8ca064cddb722af1be54e517a280b12a5356f98366899e5d" dependencies = [ "aho-corasick", "memchr", @@ -1920,9 +1913,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" @@ -2090,7 +2083,7 @@ checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", - "rustls-webpki 0.101.6", + "rustls-webpki", "sct", ] @@ -2103,16 +2096,6 @@ dependencies = [ "base64 0.21.4", ] -[[package]] -name = "rustls-webpki" -version = "0.100.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "rustls-webpki" version = "0.101.6" @@ -2660,6 +2643,19 @@ dependencies = [ "url", ] +[[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "winapi", +] + [[package]] name = "stringprep" version = "0.1.4" @@ -2742,7 +2738,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", - "fastrand 2.0.1", + "fastrand", "redox_syscall", "rustix", "windows-sys", @@ -3292,7 +3288,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna", "percent-encoding", ] @@ -3453,12 +3449,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.23.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.3", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "which" From b289621545d7c15834a622043dded8eee2c5dfcf Mon Sep 17 00:00:00 2001 From: Cameron Garnham Date: Sun, 15 Oct 2023 21:59:14 +0200 Subject: [PATCH 4/4] release: version 3.0.0-alpha.2 --- Cargo.lock | 4 ++-- Cargo.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 021b3a47..1046838d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2994,7 +2994,7 @@ dependencies = [ [[package]] name = "torrust-index" -version = "3.0.0-alpha.2-develop" +version = "3.0.0-alpha.2" dependencies = [ "argon2", "async-trait", @@ -3042,7 +3042,7 @@ dependencies = [ [[package]] name = "torrust-index-located-error" -version = "3.0.0-alpha.2-develop" +version = "3.0.0-alpha.2" dependencies = [ "log", "thiserror", diff --git a/Cargo.toml b/Cargo.toml index 36aeea0e..f656a204 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ license = "AGPL-3.0-only" publish = true repository = "https://github.com/torrust/torrust-tracker" rust-version = "1.72" -version = "3.0.0-alpha.2-develop" +version = "3.0.0-alpha.2" [profile.dev.package.sqlx-macros] opt-level = 3 @@ -68,7 +68,7 @@ text-to-png = "0" thiserror = "1" tokio = { version = "1", features = ["fs", "io-util", "macros", "net", "rt-multi-thread", "signal", "sync", "time"] } toml = "0" -torrust-index-located-error = { version = "3.0.0-alpha.2-develop", path = "packages/located-error" } +torrust-index-located-error = { version = "3.0.0-alpha.2", path = "packages/located-error" } tower-http = { version = "0", features = ["compression-full", "cors"] } urlencoding = "2" uuid = { version = "1", features = ["v4"] }