From c690827acff58bf74cc5f49953945c6e794fa64d Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Mon, 20 May 2024 07:37:18 +0800 Subject: [PATCH 01/11] chore: fix gitlab ci --- .gitlab/workflows/ci.yml | 3 ++- package.json | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab/workflows/ci.yml b/.gitlab/workflows/ci.yml index cb5cacbd..2c7d040f 100644 --- a/.gitlab/workflows/ci.yml +++ b/.gitlab/workflows/ci.yml @@ -33,6 +33,7 @@ consistency: interruptible: true rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" + allow_failure: true - if: $CI_PIPELINE_SOURCE == 'merge_request_event' script: - git config --global user.name gitlab-ci @@ -48,7 +49,7 @@ semantic-release: name: node:20.13.1 interruptible: true rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "serious-scaffold" && $CI_PROJECT_NAME == "ss-python" && $GITLAB_TOKEN != null + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "huxuan8528" && $CI_PROJECT_NAME == "ss-python" && $GITLAB_TOKEN != "" script: - > npx diff --git a/package.json b/package.json index 71a24212..5e3e6703 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,9 @@ ] }, "release": { + "branches": [ + "xuan.hu/gitlab-ci-fix" + ], "plugins": [ [ "@semantic-release/commit-analyzer", From e4af2384d66267ab527a6e6107f1142c8994656b Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Mon, 20 May 2024 07:42:57 +0800 Subject: [PATCH 02/11] test: apply same fix to renovate --- .gitlab/workflows/renovate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/workflows/renovate.yml b/.gitlab/workflows/renovate.yml index 23e1ce71..2599e7b3 100644 --- a/.gitlab/workflows/renovate.yml +++ b/.gitlab/workflows/renovate.yml @@ -5,7 +5,7 @@ renovate: - renovate/cache/renovate/repository/ image: renovate/renovate:37.356.1-full@sha256:e54b1093f2a751b4ac94988279d2621f068e79c77227d9654165a06ae3d50ad3 rules: - - if: $CI_PIPELINE_SOURCE == "schedule" && $RENOVATE_TOKEN != null + - if: $CI_PIPELINE_SOURCE == "schedule" && $RENOVATE_TOKEN != "" script: renovate $RENOVATE_EXTRA_FLAG stage: build variables: From bce53cd58483559e26623591789c352141ac19f6 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Mon, 20 May 2024 07:52:14 +0800 Subject: [PATCH 03/11] test: try another fix --- .gitlab/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/workflows/ci.yml b/.gitlab/workflows/ci.yml index 2c7d040f..56073888 100644 --- a/.gitlab/workflows/ci.yml +++ b/.gitlab/workflows/ci.yml @@ -49,7 +49,7 @@ semantic-release: name: node:20.13.1 interruptible: true rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "huxuan8528" && $CI_PROJECT_NAME == "ss-python" && $GITLAB_TOKEN != "" + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "huxuan8528" && $CI_PROJECT_NAME == "ss-python" && $PAT != null script: - > npx From 4d5ac9348fd8b674c09858df896484b5c460435c Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Mon, 20 May 2024 07:54:53 +0800 Subject: [PATCH 04/11] chore: try again --- .gitlab/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/workflows/ci.yml b/.gitlab/workflows/ci.yml index 56073888..bf3ce991 100644 --- a/.gitlab/workflows/ci.yml +++ b/.gitlab/workflows/ci.yml @@ -49,7 +49,7 @@ semantic-release: name: node:20.13.1 interruptible: true rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "huxuan8528" && $CI_PROJECT_NAME == "ss-python" && $PAT != null + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "huxuan8528" && $CI_PROJECT_NAME == "ss-python" && $GITLAB_TOKEN != null script: - > npx From e566b23127188591ac3b1f63d33a28932d2aef0b Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Mon, 20 May 2024 07:56:58 +0800 Subject: [PATCH 05/11] chore: apply same fix --- .gitlab/workflows/ci.yml | 2 +- .gitlab/workflows/renovate.yml | 2 +- .../workflows/ci.yml.jinja | 2 +- .../workflows/renovate.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab/workflows/ci.yml b/.gitlab/workflows/ci.yml index bf3ce991..56073888 100644 --- a/.gitlab/workflows/ci.yml +++ b/.gitlab/workflows/ci.yml @@ -49,7 +49,7 @@ semantic-release: name: node:20.13.1 interruptible: true rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "huxuan8528" && $CI_PROJECT_NAME == "ss-python" && $GITLAB_TOKEN != null + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "huxuan8528" && $CI_PROJECT_NAME == "ss-python" && $PAT != null script: - > npx diff --git a/.gitlab/workflows/renovate.yml b/.gitlab/workflows/renovate.yml index 2599e7b3..deb3a088 100644 --- a/.gitlab/workflows/renovate.yml +++ b/.gitlab/workflows/renovate.yml @@ -5,7 +5,7 @@ renovate: - renovate/cache/renovate/repository/ image: renovate/renovate:37.356.1-full@sha256:e54b1093f2a751b4ac94988279d2621f068e79c77227d9654165a06ae3d50ad3 rules: - - if: $CI_PIPELINE_SOURCE == "schedule" && $RENOVATE_TOKEN != "" + - if: $CI_PIPELINE_SOURCE == "schedule" && $PAT != null script: renovate $RENOVATE_EXTRA_FLAG stage: build variables: diff --git a/template/[% if repo_platform == 'gitlab' or repo_platform == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/ci.yml.jinja b/template/[% if repo_platform == 'gitlab' or repo_platform == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/ci.yml.jinja index 39fca9a6..db240164 100644 --- a/template/[% if repo_platform == 'gitlab' or repo_platform == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/ci.yml.jinja +++ b/template/[% if repo_platform == 'gitlab' or repo_platform == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/ci.yml.jinja @@ -61,7 +61,7 @@ semantic-release: name: node:20.13.1 interruptible: true rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "{{ repo_namespace }}" && $CI_PROJECT_NAME == "{{ repo_name }}" && $GITLAB_TOKEN != null + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "{{ repo_namespace }}" && $CI_PROJECT_NAME == "{{ repo_name }}" && $PAT != null script: - > npx diff --git a/template/[% if repo_platform == 'gitlab' or repo_platform == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/renovate.yml b/template/[% if repo_platform == 'gitlab' or repo_platform == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/renovate.yml index 23e1ce71..deb3a088 100644 --- a/template/[% if repo_platform == 'gitlab' or repo_platform == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/renovate.yml +++ b/template/[% if repo_platform == 'gitlab' or repo_platform == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/renovate.yml @@ -5,7 +5,7 @@ renovate: - renovate/cache/renovate/repository/ image: renovate/renovate:37.356.1-full@sha256:e54b1093f2a751b4ac94988279d2621f068e79c77227d9654165a06ae3d50ad3 rules: - - if: $CI_PIPELINE_SOURCE == "schedule" && $RENOVATE_TOKEN != null + - if: $CI_PIPELINE_SOURCE == "schedule" && $PAT != null script: renovate $RENOVATE_EXTRA_FLAG stage: build variables: From f704b586034ad78bf3edf102d78094785332f507 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Mon, 20 May 2024 08:11:55 +0800 Subject: [PATCH 06/11] chore: revert unnecessary changes for test --- .gitlab/workflows/ci.yml | 1 - package.json | 3 --- 2 files changed, 4 deletions(-) diff --git a/.gitlab/workflows/ci.yml b/.gitlab/workflows/ci.yml index 56073888..e83b54e4 100644 --- a/.gitlab/workflows/ci.yml +++ b/.gitlab/workflows/ci.yml @@ -33,7 +33,6 @@ consistency: interruptible: true rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" - allow_failure: true - if: $CI_PIPELINE_SOURCE == 'merge_request_event' script: - git config --global user.name gitlab-ci diff --git a/package.json b/package.json index 5e3e6703..71a24212 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,6 @@ ] }, "release": { - "branches": [ - "xuan.hu/gitlab-ci-fix" - ], "plugins": [ [ "@semantic-release/commit-analyzer", From ee049d18e49e981582b9c374d9a56c35a9a661e4 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Mon, 20 May 2024 08:30:19 +0800 Subject: [PATCH 07/11] test: $PAT != "" --- .gitlab/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/workflows/ci.yml b/.gitlab/workflows/ci.yml index e83b54e4..c5e8c5a6 100644 --- a/.gitlab/workflows/ci.yml +++ b/.gitlab/workflows/ci.yml @@ -48,7 +48,7 @@ semantic-release: name: node:20.13.1 interruptible: true rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "huxuan8528" && $CI_PROJECT_NAME == "ss-python" && $PAT != null + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "huxuan8528" && $CI_PROJECT_NAME == "ss-python" && $PAT != "" script: - > npx From 873ba6ceee32cb8c39b619fe5942ccba9bec7c9f Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Mon, 20 May 2024 08:31:56 +0800 Subject: [PATCH 08/11] test: $GITLAB_TOKEN != "" --- .gitlab/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/workflows/ci.yml b/.gitlab/workflows/ci.yml index c5e8c5a6..aa6a56c9 100644 --- a/.gitlab/workflows/ci.yml +++ b/.gitlab/workflows/ci.yml @@ -48,7 +48,7 @@ semantic-release: name: node:20.13.1 interruptible: true rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "huxuan8528" && $CI_PROJECT_NAME == "ss-python" && $PAT != "" + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "huxuan8528" && $CI_PROJECT_NAME == "ss-python" && $GITLAB_TOKEN != "" script: - > npx From 162cacea32e2cd979c31cc23e1c36bfde2f0d852 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Mon, 20 May 2024 08:33:43 +0800 Subject: [PATCH 09/11] test: $GITLAB_TOKEN != null --- .gitlab/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/workflows/ci.yml b/.gitlab/workflows/ci.yml index aa6a56c9..96c6323a 100644 --- a/.gitlab/workflows/ci.yml +++ b/.gitlab/workflows/ci.yml @@ -48,7 +48,7 @@ semantic-release: name: node:20.13.1 interruptible: true rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "huxuan8528" && $CI_PROJECT_NAME == "ss-python" && $GITLAB_TOKEN != "" + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "huxuan8528" && $CI_PROJECT_NAME == "ss-python" && $GITLAB_TOKEN != null script: - > npx From 99897ced81153bf6849d0449f8b5e5369083313a Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Mon, 20 May 2024 08:34:32 +0800 Subject: [PATCH 10/11] test: $PAT != null --- .gitlab/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/workflows/ci.yml b/.gitlab/workflows/ci.yml index 96c6323a..e83b54e4 100644 --- a/.gitlab/workflows/ci.yml +++ b/.gitlab/workflows/ci.yml @@ -48,7 +48,7 @@ semantic-release: name: node:20.13.1 interruptible: true rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "huxuan8528" && $CI_PROJECT_NAME == "ss-python" && $GITLAB_TOKEN != null + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "huxuan8528" && $CI_PROJECT_NAME == "ss-python" && $PAT != null script: - > npx From 45e0f45a533199865aa3efcb896ac85813a9250a Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Mon, 20 May 2024 08:53:47 +0800 Subject: [PATCH 11/11] chore: revert test changes --- .gitlab/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/workflows/ci.yml b/.gitlab/workflows/ci.yml index e83b54e4..0475bec9 100644 --- a/.gitlab/workflows/ci.yml +++ b/.gitlab/workflows/ci.yml @@ -48,7 +48,7 @@ semantic-release: name: node:20.13.1 interruptible: true rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "huxuan8528" && $CI_PROJECT_NAME == "ss-python" && $PAT != null + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "serious-scaffold" && $CI_PROJECT_NAME == "ss-python" && $PAT != null script: - > npx