From 88e7376565e6175f37be81953eb93a8b9f92b363 Mon Sep 17 00:00:00 2001 From: Amelia Yukii Date: Sun, 19 May 2024 22:36:10 +0000 Subject: [PATCH 1/4] Update file .gitlab-ci.yml --- .gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1da34db4e6..fc76389b96 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,6 +30,7 @@ testCommit: - develop - merge_requests - stable + - live-testing getImageTag: stage: deploy @@ -43,6 +44,8 @@ getImageTag: tag="latest" elif test "$CI_COMMIT_BRANCH" == "develop"; then tag="develop" + elif test "$CI_COMMIT_BRANCH" == "live-testing"; then + tag="live-testing" else tag="$CI_COMMIT_BRANCH" fi @@ -56,6 +59,7 @@ getImageTag: - stable - develop - tags + - live-testing buildDocker: stage: deploy @@ -108,3 +112,4 @@ mergeManifests: - stable - develop - tags + - live-testing From 3d3840977523005d37dc1ff30a63cce8b7df0379 Mon Sep 17 00:00:00 2001 From: Amelia Yukii Date: Sun, 19 May 2024 22:36:39 +0000 Subject: [PATCH 2/4] add live-testing branch --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc76389b96..fa9ff95e4a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,7 @@ getImageTag: elif test "$CI_COMMIT_BRANCH" == "develop"; then tag="develop" elif test "$CI_COMMIT_BRANCH" == "live-testing"; then - tag="live-testing" + tag="live-testing-DONOTUSE" else tag="$CI_COMMIT_BRANCH" fi From 711811efbdbaccb0858f682360e9fc10201e4506 Mon Sep 17 00:00:00 2001 From: Amelia Yukii Date: Sun, 19 May 2024 22:37:07 +0000 Subject: [PATCH 3/4] fix-version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1d6d521ccd..6078daf4e1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sharkey", - "version": "2024.3.3-devel", + "version": "2024.3.3-livetesting-DONOTUSE", "codename": "shonk", "repository": { "type": "git", From c4c1ea66dc8d8a9ca10f9d8ce09977c9c97e3cad Mon Sep 17 00:00:00 2001 From: Amelia Yukii Date: Sun, 19 May 2024 22:38:57 +0000 Subject: [PATCH 4/4] fix ci --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa9ff95e4a..34a415d434 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,6 +85,8 @@ buildDocker: - stable - develop - tags + - live-testing + mergeManifests: stage: deploy