From 8cd8207fa096be8d02c165d1ae66881fbb1bb443 Mon Sep 17 00:00:00 2001 From: Cyborus Date: Sat, 27 Apr 2024 12:11:58 -0400 Subject: [PATCH 1/3] add `object_format_name` back in --- src/generated/structs.rs | 11 +++++++++++ swagger.v1.json | 13 ++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/generated/structs.rs b/src/generated/structs.rs index cda1845..1445c47 100644 --- a/src/generated/structs.rs +++ b/src/generated/structs.rs @@ -688,6 +688,7 @@ pub struct CreateRepoOption { pub license: Option, /// Name of the repository to create pub name: String, + pub object_format_name: Option, /// Whether the repository is private pub private: Option, /// Readme of the repository to create @@ -1859,6 +1860,15 @@ pub struct OAuth2Application { pub redirect_uris: Option>, } +/// ObjectFormatName of the underlying git repository + +#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)] +pub enum ObjectFormatName { + #[serde(rename = "sha1")] + Sha1, + #[serde(rename = "sha256")] + Sha256, +} /// Organization represents an organization #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct Organization { @@ -2256,6 +2266,7 @@ pub struct Repository { #[serde(with = "time::serde::rfc3339::option")] pub mirror_updated: Option, pub name: Option, + pub object_format_name: Option, pub open_issues_count: Option, pub open_pr_counter: Option, #[serde(deserialize_with = "crate::none_if_blank_url")] diff --git a/swagger.v1.json b/swagger.v1.json index 052fafe..dcc3709 100644 --- a/swagger.v1.json +++ b/swagger.v1.json @@ -10,7 +10,7 @@ "name": "MIT", "url": "http://opensource.org/licenses/MIT" }, - "version": "7.0.0+gitea-1.22.0" + "version": "7.0.1+gitea-1.22.0" }, "basePath": "/api/v1", "paths": { @@ -17396,6 +17396,9 @@ "uniqueItems": true, "x-go-name": "Name" }, + "object_format_name": { + "$ref": "#/definitions/ObjectFormatName" + }, "private": { "description": "Whether the repository is private", "type": "boolean", @@ -20169,6 +20172,11 @@ }, "x-go-package": "code.gitea.io/gitea/modules/structs" }, + "ObjectFormatName": { + "description": "ObjectFormatName of the underlying git repository", + "type": "string", + "enum": ["sha1", "sha256"] + }, "Organization": { "description": "Organization represents an organization", "type": "object", @@ -21268,6 +21276,9 @@ "type": "string", "x-go-name": "Name" }, + "object_format_name": { + "$ref": "#/definitions/ObjectFormatName" + }, "open_issues_count": { "type": "integer", "format": "int64", From 55f371301c79094537a907f9d713c5f0989a8e97 Mon Sep 17 00:00:00 2001 From: Cyborus Date: Sat, 27 Apr 2024 13:14:00 -0400 Subject: [PATCH 2/3] update ci to use forgejo 7.0.1 --- .woodpecker/integration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/integration.yml b/.woodpecker/integration.yml index e6a34f9..5ace7f7 100644 --- a/.woodpecker/integration.yml +++ b/.woodpecker/integration.yml @@ -5,10 +5,10 @@ steps: image: rust environment: - "FORGEJO_API_CI_INSTANCE_URL=http://forgejo-testing:3000/" - - FORGEJO_API_CI_TOKEN=6c340bf9ed25adf28701f618fda5f82c934db1f3 + - FORGEJO_API_CI_TOKEN=3906093e3d85cf0402623eb4a5287bc0f828e820 commands: - cargo test services: forgejo-testing: - image: code.cartoon-aa.xyz/cyborus/ci-forgejo:7.0.0 + image: code.cartoon-aa.xyz/cyborus/ci-forgejo:7.0.1 From 0ae2377b9274eb3720d596fb20949c26930b5d66 Mon Sep 17 00:00:00 2001 From: Cyborus Date: Sat, 27 Apr 2024 14:32:30 -0400 Subject: [PATCH 3/3] include `object_format_name` in test --- tests/ci_test.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/ci_test.rs b/tests/ci_test.rs index 0d03074..6eca774 100644 --- a/tests/ci_test.rs +++ b/tests/ci_test.rs @@ -95,6 +95,7 @@ async fn repo() { issue_labels: Some("".into()), license: Some("".into()), name: "test".into(), + object_format_name: None, private: Some(false), readme: None, template: Some(false),