From 568e23228ebbc6321060a82f6528685966d3294e Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 29 Mar 2025 17:30:31 -0400 Subject: [PATCH 1/9] Fix build warnings --- src/main.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main.rs b/src/main.rs index 530b52d..e56db69 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,9 +1,11 @@ use axum::{ - Json, Router, - http::StatusCode, - routing::{get, post}, + // Json, + Router, + // http::StatusCode, + routing::{get}, + // routing::{get, post}, }; -use serde::{Deserialize, Serialize}; +// use serde::{Deserialize, Serialize}; #[tokio::main] async fn main() { -- 2.43.0 From a455c3ef1d78983bc70c832c047267fbdbcd6b73 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 29 Mar 2025 17:31:35 -0400 Subject: [PATCH 2/9] Code formatting --- src/main.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index e56db69..6a44cd6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,8 +1,8 @@ use axum::{ - // Json, + // Json, Router, // http::StatusCode, - routing::{get}, + routing::get, // routing::{get, post}, }; // use serde::{Deserialize, Serialize}; -- 2.43.0 From 5bb5717bf77823062a52510148550f42f1c3030d Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 29 Mar 2025 17:32:12 -0400 Subject: [PATCH 3/9] Added icarus-models --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index 8430065..52a1bfb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,3 +9,4 @@ serde = { version = "1.0.218", features = ["derive"] } serde_json = { version = "1.0.139" } tokio = { version = "1.44.1", features = ["rt-multi-thread"] } tracing-subscriber = "0.3.19" +icarus-models = { git = "ssh://git@git.kundeng.us/phoenix/icarus-models.git", tag = "v0.1.14" } -- 2.43.0 From 9c725535d2504ff3a1af38e6485ec8bbeffdbec1 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 29 Mar 2025 17:38:19 -0400 Subject: [PATCH 4/9] Added ssh key import --- .gitea/workflows/workflow.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/workflow.yml b/.gitea/workflows/workflow.yml index a18fc69..792f9f8 100644 --- a/.gitea/workflows/workflow.yml +++ b/.gitea/workflows/workflow.yml @@ -61,5 +61,13 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: 1.85.0 - - run: cargo build + - run: | + mkdir -p ~/.ssh + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitea_deploy_key + chmod 600 ~/.ssh/gitea_deploy_key + ssh-keyscan git.kundeng.us ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLl/OZiKVDxwnyvMxa+rjKvDpKqTxH1GWuGuDPLmENGQMbTVulajZWr9x8Q1cotoJiHZkt7DA5vczcjB/4lwgWA= >> ~/.ssh/known_hosts + + eval $(ssh-agent -s) + ssh-add -v ~/.ssh/gitea_deploy_key + cargo build --release -- 2.43.0 From 80b53847fafe42c474e04d4c840b45320d362141 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 29 Mar 2025 17:40:50 -0400 Subject: [PATCH 5/9] Workflow syntax error --- .gitea/workflows/workflow.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/workflow.yml b/.gitea/workflows/workflow.yml index 792f9f8..da5d41a 100644 --- a/.gitea/workflows/workflow.yml +++ b/.gitea/workflows/workflow.yml @@ -62,12 +62,12 @@ jobs: with: toolchain: 1.85.0 - run: | - mkdir -p ~/.ssh - echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitea_deploy_key - chmod 600 ~/.ssh/gitea_deploy_key - ssh-keyscan git.kundeng.us ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLl/OZiKVDxwnyvMxa+rjKvDpKqTxH1GWuGuDPLmENGQMbTVulajZWr9x8Q1cotoJiHZkt7DA5vczcjB/4lwgWA= >> ~/.ssh/known_hosts + mkdir -p ~/.ssh + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitea_deploy_key + chmod 600 ~/.ssh/gitea_deploy_key + ssh-keyscan git.kundeng.us ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLl/OZiKVDxwnyvMxa+rjKvDpKqTxH1GWuGuDPLmENGQMbTVulajZWr9x8Q1cotoJiHZkt7DA5vczcjB/4lwgWA= >> ~/.ssh/known_hosts - eval $(ssh-agent -s) - ssh-add -v ~/.ssh/gitea_deploy_key - cargo build --release + eval $(ssh-agent -s) + ssh-add -v ~/.ssh/gitea_deploy_key + cargo build --release -- 2.43.0 From 10d9c9bbc92fb3e247193d4751430ead9032508a Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 29 Mar 2025 17:46:27 -0400 Subject: [PATCH 6/9] Trying this out first --- .gitea/workflows/workflow.yml | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/workflow.yml b/.gitea/workflows/workflow.yml index da5d41a..e0cf961 100644 --- a/.gitea/workflows/workflow.yml +++ b/.gitea/workflows/workflow.yml @@ -19,7 +19,15 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: 1.85.0 - - run: cargo check + - run: | + mkdir -p ~/.ssh + echo "$EXTREPO_KEY" > ~/.ssh/gitlab_deploy_key + chmod 600 ~/.ssh/gitlab_deploy_key + ssh-keyscan git.kundeng.us ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLl/OZiKVDxwnyvMxa+rjKvDpKqTxH1GWuGuDPLmENGQMbTVulajZWr9x8Q1cotoJiHZkt7DA5vczcjB/4lwgWA= >> ~/.ssh/known_hosts + + eval $(ssh-agent -s) + ssh-add -v ~/.ssh/gitlab_deploy_key + cargo check test: name: Test Suite @@ -29,7 +37,15 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: 1.85.0 - - run: cargo test + - run: | + mkdir -p ~/.ssh + echo "$EXTREPO_KEY" > ~/.ssh/gitlab_deploy_key + chmod 600 ~/.ssh/gitlab_deploy_key + ssh-keyscan git.kundeng.us ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLl/OZiKVDxwnyvMxa+rjKvDpKqTxH1GWuGuDPLmENGQMbTVulajZWr9x8Q1cotoJiHZkt7DA5vczcjB/4lwgWA= >> ~/.ssh/known_hosts + + eval $(ssh-agent -s) + ssh-add -v ~/.ssh/gitlab_deploy_key + cargo test fmt: name: Rustfmt @@ -62,12 +78,5 @@ jobs: with: toolchain: 1.85.0 - run: | - mkdir -p ~/.ssh - echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitea_deploy_key - chmod 600 ~/.ssh/gitea_deploy_key - ssh-keyscan git.kundeng.us ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLl/OZiKVDxwnyvMxa+rjKvDpKqTxH1GWuGuDPLmENGQMbTVulajZWr9x8Q1cotoJiHZkt7DA5vczcjB/4lwgWA= >> ~/.ssh/known_hosts - - eval $(ssh-agent -s) - ssh-add -v ~/.ssh/gitea_deploy_key cargo build --release -- 2.43.0 From 8180b2d7a2e2f6d571a44aa4744098caf2577ea3 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 29 Mar 2025 17:52:00 -0400 Subject: [PATCH 7/9] ssh key import fix --- .gitea/workflows/workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/workflow.yml b/.gitea/workflows/workflow.yml index e0cf961..9bda121 100644 --- a/.gitea/workflows/workflow.yml +++ b/.gitea/workflows/workflow.yml @@ -21,7 +21,7 @@ jobs: toolchain: 1.85.0 - run: | mkdir -p ~/.ssh - echo "$EXTREPO_KEY" > ~/.ssh/gitlab_deploy_key + echo "${{ secrets.MYREPO_KEY }}" > ~/.ssh/gitlab_deploy_key chmod 600 ~/.ssh/gitlab_deploy_key ssh-keyscan git.kundeng.us ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLl/OZiKVDxwnyvMxa+rjKvDpKqTxH1GWuGuDPLmENGQMbTVulajZWr9x8Q1cotoJiHZkt7DA5vczcjB/4lwgWA= >> ~/.ssh/known_hosts @@ -39,7 +39,7 @@ jobs: toolchain: 1.85.0 - run: | mkdir -p ~/.ssh - echo "$EXTREPO_KEY" > ~/.ssh/gitlab_deploy_key + echo "${{ secrets.MYREPO_KEY }}" > ~/.ssh/gitlab_deploy_key chmod 600 ~/.ssh/gitlab_deploy_key ssh-keyscan git.kundeng.us ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLl/OZiKVDxwnyvMxa+rjKvDpKqTxH1GWuGuDPLmENGQMbTVulajZWr9x8Q1cotoJiHZkt7DA5vczcjB/4lwgWA= >> ~/.ssh/known_hosts -- 2.43.0 From a27a28a84a31cd34198ccd077fb675525597a33e Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 29 Mar 2025 17:54:30 -0400 Subject: [PATCH 8/9] secret rename --- .gitea/workflows/workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/workflow.yml b/.gitea/workflows/workflow.yml index 9bda121..7c69938 100644 --- a/.gitea/workflows/workflow.yml +++ b/.gitea/workflows/workflow.yml @@ -21,7 +21,7 @@ jobs: toolchain: 1.85.0 - run: | mkdir -p ~/.ssh - echo "${{ secrets.MYREPO_KEY }}" > ~/.ssh/gitlab_deploy_key + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key chmod 600 ~/.ssh/gitlab_deploy_key ssh-keyscan git.kundeng.us ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLl/OZiKVDxwnyvMxa+rjKvDpKqTxH1GWuGuDPLmENGQMbTVulajZWr9x8Q1cotoJiHZkt7DA5vczcjB/4lwgWA= >> ~/.ssh/known_hosts @@ -39,7 +39,7 @@ jobs: toolchain: 1.85.0 - run: | mkdir -p ~/.ssh - echo "${{ secrets.MYREPO_KEY }}" > ~/.ssh/gitlab_deploy_key + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key chmod 600 ~/.ssh/gitlab_deploy_key ssh-keyscan git.kundeng.us ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLl/OZiKVDxwnyvMxa+rjKvDpKqTxH1GWuGuDPLmENGQMbTVulajZWr9x8Q1cotoJiHZkt7DA5vczcjB/4lwgWA= >> ~/.ssh/known_hosts -- 2.43.0 From c83deecd62286fd17f8102002fdfb5d06d234ba9 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 29 Mar 2025 17:57:29 -0400 Subject: [PATCH 9/9] Added ssh key import to other stages --- .gitea/workflows/workflow.yml | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/workflow.yml b/.gitea/workflows/workflow.yml index 7c69938..3a39e64 100644 --- a/.gitea/workflows/workflow.yml +++ b/.gitea/workflows/workflow.yml @@ -56,7 +56,15 @@ jobs: with: toolchain: 1.85.0 - run: rustup component add rustfmt - - run: cargo fmt --all -- --check + - run: | + mkdir -p ~/.ssh + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key + chmod 600 ~/.ssh/gitlab_deploy_key + ssh-keyscan git.kundeng.us ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLl/OZiKVDxwnyvMxa+rjKvDpKqTxH1GWuGuDPLmENGQMbTVulajZWr9x8Q1cotoJiHZkt7DA5vczcjB/4lwgWA= >> ~/.ssh/known_hosts + + eval $(ssh-agent -s) + ssh-add -v ~/.ssh/gitlab_deploy_key + cargo fmt --all -- --check clippy: name: Clippy @@ -67,7 +75,15 @@ jobs: with: toolchain: 1.85.0 - run: rustup component add clippy - - run: cargo clippy -- -D warnings + - run: | + mkdir -p ~/.ssh + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key + chmod 600 ~/.ssh/gitlab_deploy_key + ssh-keyscan git.kundeng.us ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLl/OZiKVDxwnyvMxa+rjKvDpKqTxH1GWuGuDPLmENGQMbTVulajZWr9x8Q1cotoJiHZkt7DA5vczcjB/4lwgWA= >> ~/.ssh/known_hosts + + eval $(ssh-agent -s) + ssh-add -v ~/.ssh/gitlab_deploy_key + cargo clippy -- -D warnings build: name: build @@ -78,5 +94,12 @@ jobs: with: toolchain: 1.85.0 - run: | + mkdir -p ~/.ssh + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key + chmod 600 ~/.ssh/gitlab_deploy_key + ssh-keyscan git.kundeng.us ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLl/OZiKVDxwnyvMxa+rjKvDpKqTxH1GWuGuDPLmENGQMbTVulajZWr9x8Q1cotoJiHZkt7DA5vczcjB/4lwgWA= >> ~/.ssh/known_hosts + + eval $(ssh-agent -s) + ssh-add -v ~/.ssh/gitlab_deploy_key cargo build --release -- 2.43.0