From 10f536015067de593164ca72876228154dcc2cdd Mon Sep 17 00:00:00 2001 From: fengjun Date: Fri, 29 Mar 2024 11:33:01 +0800 Subject: [PATCH 01/23] 2024/03/29-2 --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 8c8ec3a..b4e0cf3 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/03/29-1" << std::endl; + std::cout << "2024/03/29-2" << std::endl; return 0; } -- Gitee From 18ce6bcb8646ffe168e26edc16e35fd97b151aef Mon Sep 17 00:00:00 2001 From: fengjun Date: Fri, 29 Mar 2024 11:58:01 +0800 Subject: [PATCH 02/23] 2024/03/29-3 --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index b4e0cf3..325c26e 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/03/29-2" << std::endl; + std::cout << "2024/03/29-3" << std::endl; return 0; } -- Gitee From 2bfb5aeea5e9e5c7d551443c0e99401122c2f876 Mon Sep 17 00:00:00 2001 From: fengjun Date: Fri, 29 Mar 2024 13:44:54 +0800 Subject: [PATCH 03/23] 2024/03/29-4 --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 325c26e..363cdc0 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/03/29-3" << std::endl; + std::cout << "2024/03/29-4" << std::endl; return 0; } -- Gitee From ea3fc2d0aabbc668fe4651804b7c4e69e78ead46 Mon Sep 17 00:00:00 2001 From: fengjun Date: Fri, 29 Mar 2024 13:51:50 +0800 Subject: [PATCH 04/23] 2024/03/29-5 --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 363cdc0..27e0d2b 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/03/29-4" << std::endl; + std::cout << "2024/03/29-5" << std::endl; return 0; } -- Gitee From 9066a5d6543806fae0985731eea7b61b5ed0a929 Mon Sep 17 00:00:00 2001 From: fengjun Date: Fri, 29 Mar 2024 14:46:50 +0800 Subject: [PATCH 05/23] 2024/03/29-6 --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 27e0d2b..ab92066 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/03/29-5" << std::endl; + std::cout << "2024/03/29-6" << std::endl; return 0; } -- Gitee From 197e4b130a544adc11c1c4dd0ca79e47857136c4 Mon Sep 17 00:00:00 2001 From: fengjun Date: Fri, 29 Mar 2024 15:11:59 +0800 Subject: [PATCH 06/23] 2024/03/29-7 --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index ab92066..36b8456 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/03/29-6" << std::endl; + std::cout << "2024/03/29-7" << std::endl; return 0; } -- Gitee From 99fb65cd84521953df9f5cfadf9bc055a0b115e7 Mon Sep 17 00:00:00 2001 From: fengjun Date: Fri, 29 Mar 2024 15:26:29 +0800 Subject: [PATCH 07/23] 2024/03/29-8 --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 36b8456..450e6bd 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/03/29-7" << std::endl; + std::cout << "2024/03/29-8" << std::endl; return 0; } -- Gitee From f54de2ab2b42097653eb2c39309ca4237a10599a Mon Sep 17 00:00:00 2001 From: fengjun Date: Fri, 29 Mar 2024 15:52:10 +0800 Subject: [PATCH 08/23] 2024/03/29-9 --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 450e6bd..cd51767 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/03/29-8" << std::endl; + std::cout << "2024/03/29-9" << std::endl; return 0; } -- Gitee From 42b830e2da8fd0eaa60db085abfbd2be5d38b85c Mon Sep 17 00:00:00 2001 From: fengjun Date: Fri, 29 Mar 2024 16:08:25 +0800 Subject: [PATCH 09/23] 2024/03/29-10 --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index cd51767..19675cb 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/03/29-9" << std::endl; + std::cout << "2024/03/29-10" << std::endl; return 0; } -- Gitee From 2730b4855d167cda01ffc236ef5b459b11adc942 Mon Sep 17 00:00:00 2001 From: fengjun Date: Fri, 29 Mar 2024 16:16:33 +0800 Subject: [PATCH 10/23] 2024/03/29-11 --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 19675cb..5593948 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/03/29-10" << std::endl; + std::cout << "2024/03/29-11" << std::endl; return 0; } -- Gitee From 7883cf0686193232155c3af01e1641dc1c6fbb16 Mon Sep 17 00:00:00 2001 From: fengjun Date: Fri, 29 Mar 2024 16:28:15 +0800 Subject: [PATCH 11/23] 2024/03/29-12 --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 5593948..c7e2207 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/03/29-11" << std::endl; + std::cout << "2024/03/29-12" << std::endl; return 0; } -- Gitee From 609373600dfd4b05590c0dd3f4f506ed73f36e55 Mon Sep 17 00:00:00 2001 From: fengjun Date: Fri, 29 Mar 2024 16:39:34 +0800 Subject: [PATCH 12/23] modify format --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index c7e2207..af39a5a 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/03/29-12" << std::endl; + std::cout << "2024/03/29-12" << std::endl; return 0; } -- Gitee From 71ffeb86b4f6978b2ffe5dd8961e01dfebd0acac Mon Sep 17 00:00:00 2001 From: fengjun Date: Fri, 29 Mar 2024 16:52:17 +0800 Subject: [PATCH 13/23] 2024/03/29-13 --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index af39a5a..647ee8b 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/03/29-12" << std::endl; + std::cout << "2024/03/29-13" << std::endl; return 0; } -- Gitee From 8145956f31d6c30e5b33671993fb0e92792ef744 Mon Sep 17 00:00:00 2001 From: fengjun Date: Fri, 29 Mar 2024 17:08:04 +0800 Subject: [PATCH 14/23] 2024/03/29-14 --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 647ee8b..441d090 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/03/29-13" << std::endl; + std::cout << "2024/03/29-14" << std::endl; return 0; } -- Gitee From 76257349ed8f790a4c3f1182da42d14812323719 Mon Sep 17 00:00:00 2001 From: fengjun Date: Fri, 29 Mar 2024 17:20:56 +0800 Subject: [PATCH 15/23] 2024/03/29-15 --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 441d090..760f515 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/03/29-14" << std::endl; + std::cout << "2024/03/29-15" << std::endl; return 0; } -- Gitee From eadff9a6f22b8678010ccab05153f142f2275d98 Mon Sep 17 00:00:00 2001 From: fengjun Date: Fri, 29 Mar 2024 17:54:29 +0800 Subject: [PATCH 16/23] 2024/03/29-16 --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 760f515..6aec471 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/03/29-15" << std::endl; + std::cout << "2024/03/29-16" << std::endl; return 0; } -- Gitee From 8f1f8d68bc6583056ce02a81125c071a019162fb Mon Sep 17 00:00:00 2001 From: fengjun Date: Mon, 1 Apr 2024 09:17:54 +0800 Subject: [PATCH 17/23] 2024/04/01 --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 6aec471..44483f0 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/03/29-16" << std::endl; + std::cout << "2024/04/01" << std::endl; return 0; } -- Gitee From 53762f56b36d43d599398ca76f6d72d780521eb0 Mon Sep 17 00:00:00 2001 From: fengjun Date: Mon, 1 Apr 2024 09:47:34 +0800 Subject: [PATCH 18/23] 2024/04/01-1 --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 44483f0..e958886 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/04/01" << std::endl; + std::cout << "2024/04/01-1" << std::endl; return 0; } -- Gitee From dbcd5eba535776c18e5aa2b66c2fa9bf0413b725 Mon Sep 17 00:00:00 2001 From: fengjun Date: Mon, 1 Apr 2024 09:59:46 +0800 Subject: [PATCH 19/23] 2024/04/01-2 --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index e958886..86244cc 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/04/01-1" << std::endl; + std::cout << "2024/04/01-2" << std::endl; return 0; } -- Gitee From 3e32c19c3af575977d039be26c28179166a5706a Mon Sep 17 00:00:00 2001 From: fengjun Date: Mon, 1 Apr 2024 10:07:27 +0800 Subject: [PATCH 20/23] 2024/04/01-3 --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 86244cc..962649e 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/04/01-2" << std::endl; + std::cout << "2024/04/01-3" << std::endl; return 0; } -- Gitee From f2cd28c2fd96b9e3bdfc63002f31a4dfab275687 Mon Sep 17 00:00:00 2001 From: fengjun Date: Mon, 1 Apr 2024 10:15:23 +0800 Subject: [PATCH 21/23] modify format --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 962649e..f8df48d 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/04/01-3" << std::endl; + std::cout << "2024/04/01-3" << std::endl; return 0; } -- Gitee From 5c22a64b3b2e5f54af984e4b451803d24e18bed5 Mon Sep 17 00:00:00 2001 From: fengjun Date: Mon, 1 Apr 2024 10:23:59 +0800 Subject: [PATCH 22/23] correct format --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index f8df48d..962649e 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,6 @@ int main() { std::cout << "2023/12/01" << std::endl; std::cout << "2023/12/01-2" << std::endl; std::cout << "2023/12/05-2" << std::endl; - std::cout << "2024/04/01-3" << std::endl; + std::cout << "2024/04/01-3" << std::endl; return 0; } -- Gitee From 9038e9f22e7d8dc7c722754f0d9465dc5165804d Mon Sep 17 00:00:00 2001 From: fengjun Date: Mon, 1 Apr 2024 11:25:00 +0800 Subject: [PATCH 23/23] on sync to 51 --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b283e9e..d053e4d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,10 @@ variables: WORK_BRANCHES: "master|2.0|2.1|2.2|2.3" - #是否开启同步job 开启(true 或 TRUE)关闭(false 或 FALSE) - ENABLE_SYNC: 'TRUE' + #是否关闭同步job 关闭(true 或 TRUE)打开(false 或 FALSE) + DISABLE_SYNC: 'FALSE' include: - project: 'fengjun/ks-devops' ref: main file: - '/entrypoint/develop/cmake.yml' + - '/entrypoint/develop/rc-src-sync.yml' -- Gitee