Compare commits
11 Commits
442b5d25b4
...
v_release_
| Author | SHA1 | Date | |
|---|---|---|---|
|
e49b539e61
|
|||
|
c1e8019688
|
|||
|
b648599088
|
|||
|
ca46a9eccc
|
|||
|
81350f38e4
|
|||
|
1f2d42e1d5
|
|||
|
a0f67464b5
|
|||
|
ff5699e627
|
|||
|
dc0040c2d1
|
|||
|
9950282d6e
|
|||
|
7c8e8eb236
|
1
.changes/v_release_test_4.md
Normal file
1
.changes/v_release_test_4.md
Normal file
@@ -0,0 +1 @@
|
|||||||
|
ok
|
||||||
@@ -20,17 +20,14 @@ jobs:
|
|||||||
id: read_release
|
id: read_release
|
||||||
with:
|
with:
|
||||||
path: .changes/${{ github.ref_name }}.md
|
path: .changes/${{ github.ref_name }}.md
|
||||||
- name: Setup go for using go gitea actions
|
- name: Release
|
||||||
uses: https://github.com/actions/setup-go@v4
|
uses: https://gitea.com/akkuman/gitea-release-action@v1
|
||||||
with:
|
env:
|
||||||
go-version: '>=1.20.1'
|
NODE_OPTIONS: '--experimental-fetch' # if nodejs < 18
|
||||||
- name: Use Go Action to release
|
|
||||||
id: use-go-action
|
|
||||||
uses: https://gitea.com/actions/release-action@main
|
|
||||||
with:
|
with:
|
||||||
files: |-
|
files: |-
|
||||||
target/release/cl-cli
|
target/release/cl-cli
|
||||||
config.toml.dist
|
config.toml.dist
|
||||||
api_key: '${{secrets.RELEASE_TOKEN}}'
|
md5sum: true
|
||||||
body: |
|
sha256sum: true
|
||||||
${{ steps.read_release.outputs.content }}
|
body_path: .changes/${{ github.ref_name }}.md
|
||||||
|
|||||||
25
.gitea/workflows/release/check.yaml
Normal file
25
.gitea/workflows/release/check.yaml
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
name: Check go code
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- '**'
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- '**'
|
||||||
|
pull_request_target:
|
||||||
|
branches:
|
||||||
|
- '**'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build-and-release:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: https://github.com/actions/checkout@v4
|
||||||
|
- name: Install rust toolchain
|
||||||
|
uses: https://github.com/dtolnay/rust-toolchain@stable
|
||||||
|
- name: Build binaries
|
||||||
|
run: cargo build
|
||||||
|
- name: Run tests
|
||||||
|
run: cargo test
|
||||||
2041
Cargo.lock
generated
2041
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
16
Cargo.toml
16
Cargo.toml
@@ -7,12 +7,12 @@ edition = "2021"
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
clap = { version = "4.1.13", features = ["derive"] }
|
clap = { version = "4.1.13", features = ["derive"] }
|
||||||
gitlab = "0.1607.0"
|
gitlab = "0.1804.0"
|
||||||
reqwest = "0.11.23"
|
reqwest = "0.12.24"
|
||||||
serde = { version = "1.0.158", features = ["derive"] }
|
serde = { version = "1.0.228", features = ["derive"] }
|
||||||
toml = "0.7.3"
|
toml = "0.9.8"
|
||||||
url = "2.3.1"
|
url = "2.5.7"
|
||||||
tokio = { version = "1.0.0", features = ["rt", "rt-multi-thread", "macros"] }
|
tokio = { version = "1.0.0", features = ["rt", "rt-multi-thread", "macros"] }
|
||||||
simple-home-dir = "0.2.1"
|
simple-home-dir = "0.5.2"
|
||||||
log = "0.4.17"
|
log = "0.4.28"
|
||||||
open = "5.3.1"
|
open = "5.3.2"
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ pub struct GeneralError {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl From<InvalidHeaderValue> for GeneralError {
|
impl From<InvalidHeaderValue> for GeneralError {
|
||||||
fn from(value: InvalidHeaderValue) -> Self {
|
fn from(_value: InvalidHeaderValue) -> Self {
|
||||||
GeneralError {
|
GeneralError {
|
||||||
description: "Unable to convert the token into header value".to_string(),
|
description: "Unable to convert the token into header value".to_string(),
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
use crate::config::{Config, GiteaConfig};
|
use crate::config::{Config, GiteaConfig};
|
||||||
use crate::error::GeneralError;
|
use crate::error::GeneralError;
|
||||||
use reqwest::header::{HeaderMap, ACCEPT, AUTHORIZATION};
|
use reqwest::header::{HeaderMap, ACCEPT, AUTHORIZATION};
|
||||||
use reqwest::{Body, ClientBuilder, StatusCode};
|
use reqwest::{ClientBuilder, StatusCode};
|
||||||
use serde::de::DeserializeOwned;
|
use serde::de::DeserializeOwned;
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
use url::Url;
|
use url::Url;
|
||||||
@@ -9,7 +9,7 @@ use url::Url;
|
|||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct Client {
|
pub struct Client {
|
||||||
token: String,
|
token: String,
|
||||||
base_uri: String,
|
// base_uri: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn is_client_for_url(url: &Url, config: &GiteaConfig) -> bool {
|
fn is_client_for_url(url: &Url, config: &GiteaConfig) -> bool {
|
||||||
@@ -29,6 +29,7 @@ pub(crate) fn has_client_for_url(url: &Url, config: &Config) -> bool {
|
|||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
fn client_for_url(url: &Url, config: &Config) -> Result<Client, GeneralError> {
|
fn client_for_url(url: &Url, config: &Config) -> Result<Client, GeneralError> {
|
||||||
for c in &config.gitea {
|
for c in &config.gitea {
|
||||||
if is_client_for_url(url, c) {
|
if is_client_for_url(url, c) {
|
||||||
@@ -46,10 +47,10 @@ impl Client {
|
|||||||
Self::new(&config.token, &config.domain)
|
Self::new(&config.token, &config.domain)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn new(token: &String, domain: &String) -> Self {
|
pub fn new(token: &String, _domain: &String) -> Self {
|
||||||
Client {
|
Client {
|
||||||
token: token.clone(),
|
token: token.clone(),
|
||||||
base_uri: format!("https://{}", domain.clone()),
|
// base_uri: format!("https://{}", domain.clone()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,11 @@
|
|||||||
use crate::error::GeneralError;
|
use crate::error::GeneralError;
|
||||||
use crate::gitea::client::Client;
|
|
||||||
use crate::gitea::repository::Repository;
|
use crate::gitea::repository::Repository;
|
||||||
use reqwest::Body;
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
#[derive(Debug, Deserialize)]
|
||||||
pub struct Issue {
|
pub struct Issue {
|
||||||
pub id: u64,
|
// pub id: u64,
|
||||||
pub number: u64,
|
pub number: u64,
|
||||||
pub title: String,
|
pub title: String,
|
||||||
pub body: String,
|
pub body: String,
|
||||||
@@ -20,16 +18,6 @@ pub struct IssueWriteSetBody {
|
|||||||
pub body: String,
|
pub body: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub trait IssueClient {
|
|
||||||
fn get_issue(owner_or_organisation: &String, repo: &String, number: &u64) -> Option<Issue>;
|
|
||||||
}
|
|
||||||
|
|
||||||
impl IssueClient for Client {
|
|
||||||
fn get_issue(_owner_or_organisation: &String, _repo: &String, number: &u64) -> Option<Issue> {
|
|
||||||
todo!()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn issue_html_url_to_api(url: &Url) -> Result<Url, GeneralError> {
|
pub fn issue_html_url_to_api(url: &Url) -> Result<Url, GeneralError> {
|
||||||
let mut parts = url.path_segments().unwrap();
|
let mut parts = url.path_segments().unwrap();
|
||||||
let domain = parts.next().unwrap();
|
let domain = parts.next().unwrap();
|
||||||
|
|||||||
@@ -2,8 +2,8 @@ use serde::Deserialize;
|
|||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
#[derive(Debug, Deserialize)]
|
||||||
pub struct Repository {
|
pub struct Repository {
|
||||||
id: u64,
|
// id: u64,
|
||||||
name: String,
|
// name: String,
|
||||||
owner: String,
|
// owner: String,
|
||||||
pub full_name: String,
|
pub full_name: String,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,13 +2,12 @@ use crate::cli::Issue2Work;
|
|||||||
use crate::config::Config;
|
use crate::config::Config;
|
||||||
use crate::error::GeneralError;
|
use crate::error::GeneralError;
|
||||||
use crate::gitlab::client::{client_for_url, has_client_for_url};
|
use crate::gitlab::client::{client_for_url, has_client_for_url};
|
||||||
use crate::gitlab::issue::IssueBundle;
|
use crate::gitlab::issue::{Issue, IssueBundle, Project};
|
||||||
use crate::openproject::client::Client;
|
use crate::openproject::client::Client;
|
||||||
use crate::openproject::user::{GetMe, User};
|
use crate::openproject::user::{GetMe, User};
|
||||||
use crate::openproject::work::WorkPackageWriterAssignee;
|
use crate::openproject::work::WorkPackageWriterAssignee;
|
||||||
use crate::planning::Issue2WorkActionTrait;
|
use crate::planning::Issue2WorkActionTrait;
|
||||||
use gitlab::api::{issues, projects, AsyncQuery};
|
use gitlab::api::{issues, projects, AsyncQuery};
|
||||||
use gitlab::{Issue, Project};
|
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
@@ -41,7 +40,7 @@ impl Issue2WorkActionTrait for GitlabAction {
|
|||||||
let issue = issues.first().unwrap();
|
let issue = issues.first().unwrap();
|
||||||
|
|
||||||
let project_endpoint = projects::Project::builder()
|
let project_endpoint = projects::Project::builder()
|
||||||
.project(issue.project_id.value())
|
.project(issue.project_id)
|
||||||
.build()
|
.build()
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
|
|||||||
@@ -3,10 +3,6 @@ use crate::error::GeneralError;
|
|||||||
use gitlab::{AsyncGitlab, GitlabBuilder};
|
use gitlab::{AsyncGitlab, GitlabBuilder};
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
pub struct ClientProvider {}
|
|
||||||
|
|
||||||
impl ClientProvider {}
|
|
||||||
|
|
||||||
fn is_client_for_url(url: &Url, config: &GitlabConfig) -> bool {
|
fn is_client_for_url(url: &Url, config: &GitlabConfig) -> bool {
|
||||||
if url.domain() == Some(config.domain.as_str()) {
|
if url.domain() == Some(config.domain.as_str()) {
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -1,5 +1,17 @@
|
|||||||
use gitlab::Issue;
|
use serde::Deserialize;
|
||||||
use gitlab::Project;
|
|
||||||
|
#[derive(Clone, Debug, Deserialize)]
|
||||||
|
pub struct Issue {
|
||||||
|
pub iid: u64,
|
||||||
|
pub title: String,
|
||||||
|
pub web_url: String,
|
||||||
|
pub project_id: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, Deserialize)]
|
||||||
|
pub struct Project {
|
||||||
|
pub name_with_namespace: String,
|
||||||
|
}
|
||||||
|
|
||||||
/// A struct which contains Issue and Project
|
/// A struct which contains Issue and Project
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
|
|
||||||
#[derive(Deserialize, Debug)]
|
// #[derive(Deserialize, Debug)]
|
||||||
pub struct HalEntity {
|
// pub struct HalEntity {
|
||||||
#[serde(rename = "_type")]
|
// // #[serde(rename = "_type")]
|
||||||
pub d_type: String,
|
// // pub d_type: String,
|
||||||
}
|
// }
|
||||||
|
|
||||||
#[derive(Deserialize, Debug, Clone)]
|
#[derive(Deserialize, Debug, Clone)]
|
||||||
pub struct Link {
|
pub struct Link {
|
||||||
pub href: String,
|
pub href: String,
|
||||||
pub title: Option<String>,
|
// pub title: Option<String>,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
use crate::openproject::client::{handle_response_status, Client, OpenProjectError};
|
use crate::openproject::client::{handle_response_status, Client, OpenProjectError};
|
||||||
use crate::openproject::hal::HalEntity;
|
// use crate::openproject::hal::HalEntity;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
|
|
||||||
#[derive(Deserialize, Debug)]
|
#[derive(Deserialize, Debug)]
|
||||||
pub struct User {
|
pub struct User {
|
||||||
pub href: String,
|
pub href: String,
|
||||||
pub title: String,
|
// pub title: String,
|
||||||
}
|
}
|
||||||
#[derive(Deserialize, Debug)]
|
#[derive(Deserialize, Debug)]
|
||||||
pub struct Links {
|
pub struct Links {
|
||||||
@@ -13,12 +13,12 @@ pub struct Links {
|
|||||||
}
|
}
|
||||||
#[derive(Deserialize, Debug)]
|
#[derive(Deserialize, Debug)]
|
||||||
pub struct Root {
|
pub struct Root {
|
||||||
#[serde(rename = "instanceName")]
|
// #[serde(rename = "instanceName")]
|
||||||
pub instance_name: String,
|
// pub instance_name: String,
|
||||||
#[serde(rename = "_links")]
|
#[serde(rename = "_links")]
|
||||||
pub links: Links,
|
pub links: Links,
|
||||||
#[serde(flatten)]
|
// #[serde(flatten)]
|
||||||
pub hal_entity: HalEntity,
|
// pub hal_entity: HalEntity,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub trait RootClient {
|
pub trait RootClient {
|
||||||
|
|||||||
@@ -10,13 +10,10 @@ pub struct UserLink {
|
|||||||
}
|
}
|
||||||
#[derive(Deserialize, Debug, Clone)]
|
#[derive(Deserialize, Debug, Clone)]
|
||||||
pub struct User {
|
pub struct User {
|
||||||
#[serde(rename = "_type")]
|
// #[serde(rename = "_type")]
|
||||||
#[allow(unused_variables)]
|
// pub d_type: String,
|
||||||
pub d_type: String,
|
// pub id: u64,
|
||||||
#[allow(unused_variables)]
|
// pub name: String,
|
||||||
pub id: u64,
|
|
||||||
#[allow(unused_variables)]
|
|
||||||
pub name: String,
|
|
||||||
#[serde(rename = "_links")]
|
#[serde(rename = "_links")]
|
||||||
pub d_links: UserLink,
|
pub d_links: UserLink,
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user