From 8a0867242311e31d65b3614546a960c34620aeb1 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 5 Apr 2025 21:27:50 +0000 Subject: [PATCH 1/3] workflow_tag_fix (#33) Reviewed-on: https://git.kundeng.us/phoenix/icarus_models/pulls/33 Co-authored-by: phoenix Co-committed-by: phoenix --- .gitea/workflows/tag_release.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml index b4106cc..1f3e199 100644 --- a/.gitea/workflows/tag_release.yaml +++ b/.gitea/workflows/tag_release.yaml @@ -42,6 +42,12 @@ jobs: echo "Printing version" echo "Version: ${{ steps.version.outputs.project_tag_release }}" + - name: Check Branch + if: github.ref != 'refs/heads/main' || github.ref != 'refs/heads/devel' # Replace 'main' with your required branch + run: | + echo "::error::Release can only be created from the 'main' branch." + exit 1 + - name: Create GitHub Release uses: actions/create-release@v1 env: From 6411133c95bc3baa00be500bbe339c836da3c2e3 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 5 Apr 2025 21:59:26 +0000 Subject: [PATCH 2/3] workflow_tag_fix (#35) Reviewed-on: https://git.kundeng.us/phoenix/icarus_models/pulls/35 Co-authored-by: phoenix Co-committed-by: phoenix --- .gitea/workflows/tag_release.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml index 1f3e199..e7b9c13 100644 --- a/.gitea/workflows/tag_release.yaml +++ b/.gitea/workflows/tag_release.yaml @@ -3,9 +3,8 @@ name: Release Tagging on: push: branches: + - main - devel - tags: - - 'v*' # Trigger on tags matching v* jobs: release: @@ -42,12 +41,6 @@ jobs: echo "Printing version" echo "Version: ${{ steps.version.outputs.project_tag_release }}" - - name: Check Branch - if: github.ref != 'refs/heads/main' || github.ref != 'refs/heads/devel' # Replace 'main' with your required branch - run: | - echo "::error::Release can only be created from the 'main' branch." - exit 1 - - name: Create GitHub Release uses: actions/create-release@v1 env: From 6467521a02e3a71f82b34beb6cea863687a1313c Mon Sep 17 00:00:00 2001 From: phoenix Date: Mon, 7 Apr 2025 00:47:51 +0000 Subject: [PATCH 3/3] Changed expiration field of LoginResult to i64 (#36) Reviewed-on: https://git.kundeng.us/phoenix/icarus_models/pulls/36 Co-authored-by: phoenix Co-committed-by: phoenix --- Cargo.toml | 3 ++- src/login_result.rs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 261f79b..0a52d23 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icarus_models" -version = "0.4.0" +version = "0.4.1" edition = "2024" rust-version = "1.86" description = "models used for the icarus project" @@ -12,5 +12,6 @@ serde_json = { version = "1.0.139" } rand = { version = "0.9" } time = { version = "0.3.41", features = ["formatting", "macros", "parsing", "serde"] } uuid = { version = "1.16.0", features = ["v4", "serde"] } + [dev-dependencies] tempfile = { version = "3.19.1" } diff --git a/src/login_result.rs b/src/login_result.rs index 29d60d9..629d1c4 100644 --- a/src/login_result.rs +++ b/src/login_result.rs @@ -9,7 +9,7 @@ pub struct LoginResult { pub token: String, #[serde(alias = "token_type")] pub token_type: String, - pub expiration: i32, + pub expiration: i64, } impl Default for LoginResult {