From ba1b556ad51b8d9dda5bbf0056e1cffb71832932 Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 7 Apr 2025 04:07:10 +0000 Subject: [PATCH 01/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c1e305a..440d500 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,10 +13,10 @@ stages: - 05.TableTextConversion # 00.StaryEvo -job_deploy: +job_StaryEvo: only: - master - stage: deploy + stage: 00.StaryEvo tags: - master before_script: @@ -35,10 +35,10 @@ job_deploy: retry: 0 # 01.CodeChecker -job_deploy: +job_CodeChecker: only: - master - stage: deploy + stage: 01.CodeChecker tags: - master before_script: @@ -57,10 +57,10 @@ job_deploy: retry: 0 # 02.InformationSave -job_deploy: +job_InformationSave: only: - master - stage: deploy + stage: 02.InformationSave tags: - master before_script: @@ -79,10 +79,10 @@ job_deploy: retry: 0 # 03.FiniteStateMachine -job_deploy: +job_FiniteStateMachine: only: - master - stage: deploy + stage: 03.FiniteStateMachine tags: - master before_script: @@ -101,10 +101,10 @@ job_deploy: retry: 0 # 04.AudioCore -job_deploy: +job_AudioCore: only: - master - stage: deploy + stage: 04.AudioCore tags: - master before_script: @@ -123,10 +123,10 @@ job_deploy: retry: 0 # 05.TableTextConversion -job_deploy: +job_TableTextConversion: only: - master - stage: deploy + stage: 05.TableTextConversion tags: - master before_script: From 63c5f6b28655a52e5dc788e6917e7606bdf9579b Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 7 Apr 2025 04:13:42 +0000 Subject: [PATCH 02/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 440d500..80041d9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ job_StaryEvo: - master stage: 00.StaryEvo tags: - - master + - xosmoPlugin before_script: - echo '开始发布' - docker info # 添加 Docker 环境验证 @@ -40,7 +40,7 @@ job_CodeChecker: - master stage: 01.CodeChecker tags: - - master + - xosmoPlugin before_script: - echo '开始发布' - docker info # 添加 Docker 环境验证 @@ -62,7 +62,7 @@ job_InformationSave: - master stage: 02.InformationSave tags: - - master + - xosmoPlugin before_script: - echo '开始发布' - docker info # 添加 Docker 环境验证 @@ -84,7 +84,7 @@ job_FiniteStateMachine: - master stage: 03.FiniteStateMachine tags: - - master + - xosmoPlugin before_script: - echo '开始发布' - docker info # 添加 Docker 环境验证 @@ -106,7 +106,7 @@ job_AudioCore: - master stage: 04.AudioCore tags: - - master + - xosmoPlugin before_script: - echo '开始发布' - docker info # 添加 Docker 环境验证 @@ -128,7 +128,7 @@ job_TableTextConversion: - master stage: 05.TableTextConversion tags: - - master + - xosmoPlugin before_script: - echo '开始发布' - docker info # 添加 Docker 环境验证 From e6eca10abae818b6520751d1bfa2b0a31b4f2589 Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 7 Apr 2025 04:16:05 +0000 Subject: [PATCH 03/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 80041d9..9848cf5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,7 @@ job_StaryEvo: - xosmoPlugin before_script: - echo '开始发布' - - docker info # 添加 Docker 环境验证 + - ln -sf /srv/node-v13.11.0-linux-x64/bin/node /bin/node # 创建软链接到 bin 目录 - node -v # 验证 Node.js 版本 script: - cd Assets/00.StaryEvo @@ -43,7 +43,6 @@ job_CodeChecker: - xosmoPlugin before_script: - echo '开始发布' - - docker info # 添加 Docker 环境验证 - node -v # 验证 Node.js 版本 script: - cd Assets/01.CodeChecker @@ -65,7 +64,6 @@ job_InformationSave: - xosmoPlugin before_script: - echo '开始发布' - - docker info # 添加 Docker 环境验证 - node -v # 验证 Node.js 版本 script: - cd Assets/02.InformationSave @@ -87,7 +85,6 @@ job_FiniteStateMachine: - xosmoPlugin before_script: - echo '开始发布' - - docker info # 添加 Docker 环境验证 - node -v # 验证 Node.js 版本 script: - cd Assets/03.FiniteStateMachine @@ -109,7 +106,6 @@ job_AudioCore: - xosmoPlugin before_script: - echo '开始发布' - - docker info # 添加 Docker 环境验证 - node -v # 验证 Node.js 版本 script: - cd Assets/04.AudioCore @@ -131,7 +127,6 @@ job_TableTextConversion: - xosmoPlugin before_script: - echo '开始发布' - - docker info # 添加 Docker 环境验证 - node -v # 验证 Node.js 版本 script: - cd Assets/05.TableTextConversion From 40d68b34cc8e412686e9e28b1693fc91028e1fc5 Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 7 Apr 2025 04:21:58 +0000 Subject: [PATCH 04/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9848cf5..085ac5a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,7 @@ default: before_script: - echo '====== 准备构建中 =========' - ln -sf /srv/node-v13.11.0-linux-x64/bin/node /bin/node # 创建软链接到 bin 目录 + - ln -sf /srv/node-v13.11.0-linux-x64/bin/npm /bin/npm # 创建软链接到 bin 目录 stages: - 00.StaryEvo - 01.CodeChecker From 9c97b030d2d81bd7aab67b5051a59af3eef7fa2a Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 7 Apr 2025 04:23:54 +0000 Subject: [PATCH 05/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 085ac5a..f8e6c85 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,6 @@ default: - image: node:latest + image: node:13.11.0 # 显式指定用户 -before_script: - - echo '====== 准备构建中 =========' - - ln -sf /srv/node-v13.11.0-linux-x64/bin/node /bin/node # 创建软链接到 bin 目录 - - ln -sf /srv/node-v13.11.0-linux-x64/bin/npm /bin/npm # 创建软链接到 bin 目录 stages: - 00.StaryEvo - 01.CodeChecker @@ -22,7 +18,8 @@ job_StaryEvo: - xosmoPlugin before_script: - echo '开始发布' - - ln -sf /srv/node-v13.11.0-linux-x64/bin/node /bin/node # 创建软链接到 bin 目录 + - sudo ln -sf /srv/node-v13.11.0/bin/node /usr/bin/node # 创建软链接到 bin 目录 + - sudo ln -sf /srv/node-v13.11.0/bin/npm /usr/bin/npm # 创建软链接到 bin 目录 - node -v # 验证 Node.js 版本 script: - cd Assets/00.StaryEvo From 74d380e41e5b1f44b25c187ba9eda8f08e19d201 Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 7 Apr 2025 04:27:05 +0000 Subject: [PATCH 06/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8e6c85..b719dbf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,6 @@ job_StaryEvo: - npm publish - echo '00.StaryEvo构建完成' when: 'on_success' - retry: 0 # 01.CodeChecker job_CodeChecker: @@ -51,7 +50,6 @@ job_CodeChecker: - npm publish - echo '01.CodeChecker构建完成' when: 'on_success' - retry: 0 # 02.InformationSave job_InformationSave: @@ -72,7 +70,6 @@ job_InformationSave: - npm publish - echo '02.InformationSave构建完成' when: 'on_success' - retry: 0 # 03.FiniteStateMachine job_FiniteStateMachine: @@ -93,7 +90,6 @@ job_FiniteStateMachine: - npm publish - echo '03.FiniteStateMachine构建完成' when: 'on_success' - retry: 0 # 04.AudioCore job_AudioCore: @@ -114,7 +110,6 @@ job_AudioCore: - npm publish - echo '04.AudioCore构建完成' when: 'on_success' - retry: 0 # 05.TableTextConversion job_TableTextConversion: @@ -135,7 +130,6 @@ job_TableTextConversion: - npm publish - echo '05.TableTextConversion构建完成' when: 'on_success' - retry: 0 after_script: - echo "====== 发布完成 =========" From 3c76dc176efdc0497cd6185861b97c897a547aad Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 7 Apr 2025 04:30:25 +0000 Subject: [PATCH 07/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b719dbf..df6d4ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,7 @@ default: image: node:13.11.0 # 显式指定用户 -stages: - - 00.StaryEvo - - 01.CodeChecker - - 02.InformationSave - - 03.FiniteStateMachine - - 04.AudioCore - - 05.TableTextConversion + # 00.StaryEvo job_StaryEvo: From ed931c94fac933118370975c862bb16f195fde40 Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 7 Apr 2025 04:30:43 +0000 Subject: [PATCH 08/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df6d4ad..b719dbf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,13 @@ default: image: node:13.11.0 # 显式指定用户 - +stages: + - 00.StaryEvo + - 01.CodeChecker + - 02.InformationSave + - 03.FiniteStateMachine + - 04.AudioCore + - 05.TableTextConversion # 00.StaryEvo job_StaryEvo: From 71f0c2e2127616c7f83c7913cda6ed049c366da7 Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 7 Apr 2025 06:07:16 +0000 Subject: [PATCH 09/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b719dbf..733b667 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,5 @@ default: image: node:13.11.0 # 显式指定用户 - stages: - 00.StaryEvo - 01.CodeChecker @@ -29,6 +28,7 @@ job_StaryEvo: - echo "//${SERVER_HOST}/:_authToken=${AuthToken}" >> .npmrc - npm publish - echo '00.StaryEvo构建完成' + allow_failure: true when: 'on_success' # 01.CodeChecker @@ -49,6 +49,7 @@ job_CodeChecker: - echo "//${SERVER_HOST}/:_authToken=${AuthToken}" >> .npmrc - npm publish - echo '01.CodeChecker构建完成' + allow_failure: true when: 'on_success' # 02.InformationSave @@ -89,6 +90,7 @@ job_FiniteStateMachine: - echo "//${SERVER_HOST}/:_authToken=${AuthToken}" >> .npmrc - npm publish - echo '03.FiniteStateMachine构建完成' + allow_failure: true when: 'on_success' # 04.AudioCore @@ -109,6 +111,7 @@ job_AudioCore: - echo "//${SERVER_HOST}/:_authToken=${AuthToken}" >> .npmrc - npm publish - echo '04.AudioCore构建完成' + allow_failure: true when: 'on_success' # 05.TableTextConversion @@ -129,6 +132,7 @@ job_TableTextConversion: - echo "//${SERVER_HOST}/:_authToken=${AuthToken}" >> .npmrc - npm publish - echo '05.TableTextConversion构建完成' + allow_failure: true when: 'on_success' after_script: From 4589128e9cdd7474a30ca51288c54a1c9ded1f9a Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 7 Apr 2025 06:07:58 +0000 Subject: [PATCH 10/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 733b667..363e60f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,6 +70,7 @@ job_InformationSave: - echo "//${SERVER_HOST}/:_authToken=${AuthToken}" >> .npmrc - npm publish - echo '02.InformationSave构建完成' + allow_failure: true when: 'on_success' # 03.FiniteStateMachine