From 9ae0e390fb6d0f40378d62a18f10b1273e2ad7e2 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sun, 14 Jun 2026 17:28:08 -0400 Subject: [PATCH 01/11] Utilizing features --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9036ea7..5fd6c23 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1657,8 +1657,8 @@ dependencies = [ [[package]] name = "textsender_models" -version = "0.3.1" -source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.3.1#ba998096cb5d35dae8e627136a795c4d9af5c8f5" +version = "0.3.4" +source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.3.4-28-e7834093a6-111#e7834093a6dc5e559d0ecb0c17907cb2d8d11d3a" dependencies = [ "const_format", "dotenvy", diff --git a/Cargo.toml b/Cargo.toml index 03a8659..db73daf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ uuid = { version = "1.23.1", features = ["v4", "serde"] } base64-ng = { version = "1.0.8" } const_format = { version = "0.2.36" } josekit = { version = "0.10.3" } -textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.3.1" } +textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.3.4-28-e7834093a6-111", features = ["config", "contact", "message"] } [dev-dependencies] tempfile = { version = "3.27.0" } -- 2.47.3 From e3270a1be5d4847ba240786d5d3eb39c29c73250 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sun, 14 Jun 2026 17:30:48 -0400 Subject: [PATCH 02/11] Workflow updates --- .gitea/workflows/pr.yml | 69 +++++++++++++++++++++++++++++++++++ .gitea/workflows/workflow.yml | 3 -- 2 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 .gitea/workflows/pr.yml diff --git a/.gitea/workflows/pr.yml b/.gitea/workflows/pr.yml new file mode 100644 index 0000000..df91834 --- /dev/null +++ b/.gitea/workflows/pr.yml @@ -0,0 +1,69 @@ +name: swoosh pr + +on: + pull_request: + branches: + - main + +jobs: + check: + name: Check + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v5 + - uses: actions-rust-lang/setup-rust-toolchain@v1 + with: + toolchain: 1.95 + - uses: Swatinem/rust-cache@v2 + - run: | + mkdir -p ~/.ssh + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key + chmod 600 ~/.ssh/textsender-models_deploy_key + ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts + + eval $(ssh-agent -s) + ssh-add -v ~/.ssh/textsender-models_deploy_key + + cargo check + + fmt: + name: Rustfmt + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v5 + - uses: actions-rust-lang/setup-rust-toolchain@v1 + with: + toolchain: 1.95 + - uses: Swatinem/rust-cache@v2 + - run: rustup component add rustfmt + - run: | + mkdir -p ~/.ssh + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key + chmod 600 ~/.ssh/textsender-models_deploy_key + ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts + + eval $(ssh-agent -s) + ssh-add -v ~/.ssh/textsender-models_deploy_key + + cargo fmt --all -- --check + + clippy: + name: Clippy + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v5 + - uses: actions-rust-lang/setup-rust-toolchain@v1 + with: + toolchain: 1.95 + - uses: Swatinem/rust-cache@v2 + - run: rustup component add clippy + - run: | + mkdir -p ~/.ssh + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key + chmod 600 ~/.ssh/textsender-models_deploy_key + ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts + + eval $(ssh-agent -s) + ssh-add -v ~/.ssh/textsender-models_deploy_key + + cargo clippy -- -D warnings diff --git a/.gitea/workflows/workflow.yml b/.gitea/workflows/workflow.yml index b440671..5236e58 100644 --- a/.gitea/workflows/workflow.yml +++ b/.gitea/workflows/workflow.yml @@ -4,9 +4,6 @@ on: push: branches: - main - pull_request: - branches: - - main jobs: check: -- 2.47.3 From ef5f1500c1ad29d752e054376139b37a1c2bcaaa Mon Sep 17 00:00:00 2001 From: phoenix Date: Sun, 14 Jun 2026 17:32:28 -0400 Subject: [PATCH 03/11] bump: rust ci --- .gitea/workflows/pr.yml | 6 +++--- .gitea/workflows/release.yml | 2 +- .gitea/workflows/workflow.yml | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/pr.yml b/.gitea/workflows/pr.yml index df91834..19bae32 100644 --- a/.gitea/workflows/pr.yml +++ b/.gitea/workflows/pr.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v5 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.95 + toolchain: 1.96 - uses: Swatinem/rust-cache@v2 - run: | mkdir -p ~/.ssh @@ -33,7 +33,7 @@ jobs: - uses: actions/checkout@v5 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.95 + toolchain: 1.96 - uses: Swatinem/rust-cache@v2 - run: rustup component add rustfmt - run: | @@ -54,7 +54,7 @@ jobs: - uses: actions/checkout@v5 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.95 + toolchain: 1.96 - uses: Swatinem/rust-cache@v2 - run: rustup component add clippy - run: | diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 33f9065..0dc7ab3 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -20,7 +20,7 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1 with: - toolchain: 1.95 + toolchain: 1.96 components: cargo - name: Extract Version from Cargo.toml diff --git a/.gitea/workflows/workflow.yml b/.gitea/workflows/workflow.yml index 5236e58..c142370 100644 --- a/.gitea/workflows/workflow.yml +++ b/.gitea/workflows/workflow.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v5 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.95 + toolchain: 1.96 - uses: Swatinem/rust-cache@v2 - run: | mkdir -p ~/.ssh @@ -33,7 +33,7 @@ jobs: - uses: actions/checkout@v5 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.95 + toolchain: 1.96 - uses: Swatinem/rust-cache@v2 - run: | mkdir -p ~/.ssh @@ -53,7 +53,7 @@ jobs: - uses: actions/checkout@v5 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.95 + toolchain: 1.96 - uses: Swatinem/rust-cache@v2 - run: rustup component add rustfmt - run: | @@ -74,7 +74,7 @@ jobs: - uses: actions/checkout@v5 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.95 + toolchain: 1.96 - uses: Swatinem/rust-cache@v2 - run: rustup component add clippy - run: | @@ -95,7 +95,7 @@ jobs: - uses: actions/checkout@v5 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.95 + toolchain: 1.96 - uses: Swatinem/rust-cache@v2 - run: | mkdir -p ~/.ssh -- 2.47.3 From 3c29c95824db8923fa0db5b2e876d815b8964f27 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sun, 14 Jun 2026 17:32:35 -0400 Subject: [PATCH 04/11] bump: rust --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index db73daf..dda3503 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "swoosh" version = "0.3.4" edition = "2024" -rust-version = "1.95" +rust-version = "1.96" description = "Library to send text messages" [dependencies] -- 2.47.3 From 17e33df9d0b4ca9aeab64b637cd7990432fa8e16 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sun, 14 Jun 2026 17:45:35 -0400 Subject: [PATCH 05/11] bump: textsender_models and time --- Cargo.lock | 18 ++++++++---------- Cargo.toml | 4 ++-- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5fd6c23..8e85387 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -206,7 +206,6 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" dependencies = [ - "powerfmt", "serde_core", ] @@ -1657,8 +1656,8 @@ dependencies = [ [[package]] name = "textsender_models" -version = "0.3.4" -source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.3.4-28-e7834093a6-111#e7834093a6dc5e559d0ecb0c17907cb2d8d11d3a" +version = "0.4.0" +source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.4.0#2722af5589023db819554a97c1f596d9e735fe96" dependencies = [ "const_format", "dotenvy", @@ -1692,12 +1691,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.47" +version = "0.3.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" +checksum = "711a53c2d47bbd818258c498c8dbfe186a2526c631495cfe7e078567f86b8469" dependencies = [ "deranged", - "itoa", "num-conv", "powerfmt", "serde_core", @@ -1707,15 +1705,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" +checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" [[package]] name = "time-macros" -version = "0.2.27" +version = "0.2.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" +checksum = "71c652a3727a9cbb9a02f707f530b618ce00d0ccd762009c8c23bd191df3c17d" dependencies = [ "num-conv", "time-core", diff --git a/Cargo.toml b/Cargo.toml index dda3503..551e1eb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,12 +13,12 @@ futures = { version = "0.3.32" } http = { version = "1.4.0" } reqwest = { version = "0.13.3", features = ["form", "json", "blocking", "multipart", "stream"] } rand = { version = "0.10.1" } -time = { version = "0.3.47", features = ["formatting", "macros", "parsing", "serde"] } +time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"] } uuid = { version = "1.23.1", features = ["v4", "serde"] } base64-ng = { version = "1.0.8" } const_format = { version = "0.2.36" } josekit = { version = "0.10.3" } -textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.3.4-28-e7834093a6-111", features = ["config", "contact", "message"] } +textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.4.0", features = ["config", "contact", "message"] } [dev-dependencies] tempfile = { version = "3.27.0" } -- 2.47.3 From 8771c27a20c80d90218e9064d740a13583c7a9eb Mon Sep 17 00:00:00 2001 From: phoenix Date: Sun, 14 Jun 2026 17:46:01 -0400 Subject: [PATCH 06/11] bump: serde_json --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 551e1eb..841375e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ description = "Library to send text messages" [dependencies] serde = { version = "1.0.228", features = ["derive"] } -serde_json = { version = "1.0.149" } +serde_json = { version = "1.0.150" } tokio = { version = "1.52.2", features = ["full"] } futures = { version = "0.3.32" } http = { version = "1.4.0" } -- 2.47.3 From d6b1d15ed8115923c755ffd06300a1393b020658 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sun, 14 Jun 2026 17:46:45 -0400 Subject: [PATCH 07/11] bump: tokio --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 841375e..f9993d8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ description = "Library to send text messages" [dependencies] serde = { version = "1.0.228", features = ["derive"] } serde_json = { version = "1.0.150" } -tokio = { version = "1.52.2", features = ["full"] } +tokio = { version = "1.52.3", features = ["full"] } futures = { version = "0.3.32" } http = { version = "1.4.0" } reqwest = { version = "0.13.3", features = ["form", "json", "blocking", "multipart", "stream"] } -- 2.47.3 From aac97987c24e97e1b1b13f8c0a73cef661054468 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sun, 14 Jun 2026 17:47:18 -0400 Subject: [PATCH 08/11] bump: http --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index f9993d8..18a6b80 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ serde = { version = "1.0.228", features = ["derive"] } serde_json = { version = "1.0.150" } tokio = { version = "1.52.3", features = ["full"] } futures = { version = "0.3.32" } -http = { version = "1.4.0" } +http = { version = "1.4.2" } reqwest = { version = "0.13.3", features = ["form", "json", "blocking", "multipart", "stream"] } rand = { version = "0.10.1" } time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"] } -- 2.47.3 From 7eb977791e2418efa6ac7f9c4c822d11d1c0315b Mon Sep 17 00:00:00 2001 From: phoenix Date: Sun, 14 Jun 2026 17:47:44 -0400 Subject: [PATCH 09/11] bump: Reqwest --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 18a6b80..15b7af3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ serde_json = { version = "1.0.150" } tokio = { version = "1.52.3", features = ["full"] } futures = { version = "0.3.32" } http = { version = "1.4.2" } -reqwest = { version = "0.13.3", features = ["form", "json", "blocking", "multipart", "stream"] } +reqwest = { version = "0.13.4", features = ["form", "json", "blocking", "multipart", "stream"] } rand = { version = "0.10.1" } time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"] } uuid = { version = "1.23.1", features = ["v4", "serde"] } -- 2.47.3 From 17bf9622f60f8ec2e880bb0d3c9157bf00288b94 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sun, 14 Jun 2026 17:48:18 -0400 Subject: [PATCH 10/11] bump: uuid --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 15b7af3..639e13c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ http = { version = "1.4.2" } reqwest = { version = "0.13.4", features = ["form", "json", "blocking", "multipart", "stream"] } rand = { version = "0.10.1" } time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"] } -uuid = { version = "1.23.1", features = ["v4", "serde"] } +uuid = { version = "1.23.3", features = ["v4", "serde"] } base64-ng = { version = "1.0.8" } const_format = { version = "0.2.36" } josekit = { version = "0.10.3" } -- 2.47.3 From 47811b8ff907fa20b8c118c5790b3870ffa1d969 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sun, 14 Jun 2026 17:49:12 -0400 Subject: [PATCH 11/11] bump: swoosh --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8e85387..1fb953f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1571,7 +1571,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "swoosh" -version = "0.3.4" +version = "0.4.0" dependencies = [ "base64-ng", "const_format", diff --git a/Cargo.toml b/Cargo.toml index 639e13c..870cacd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "swoosh" -version = "0.3.4" +version = "0.4.0" edition = "2024" rust-version = "1.96" description = "Library to send text messages" -- 2.47.3