NTR - Fetch tags in

shopware · Jun 17, 2020 · 5b0f89e · 5b0f89e
1 parent a47bd4d
commit 5b0f89e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.gitlab-ci/e2e/update-api-mock.js b/.gitlab-ci/e2e/update-api-mock.js
@@ -80,9 +80,9 @@ app.get('/v1/release/update', (req, res) => {
 })
 
 
-let { PORT, FAKE_VERSION, UPDATE_FILE_PATH, WEB_DOCUMENT_ROOT } = process.env;
+let { PORT, FAKE_VERSION, TAG, UPDATE_FILE_PATH, WEB_DOCUMENT_ROOT } = process.env;
 
-FAKE_VERSION = FAKE_VERSION || '6.2.1';
+FAKE_VERSION = FAKE_VERSION || TAG || '6.2.1';
 FAKE_VERSION = FAKE_VERSION[0] === 'v' ? FAKE_VERSION.slice(1) : FAKE_VERSION;
 
 PORT = PORT || 3000

diff --git a/.gitlab-ci/release.yml b/.gitlab-ci/release.yml
@@ -55,6 +55,7 @@ Insert-Release-Data:
     script:
         - 'set -x'
         - '[[ -e artifacts/install.zip && -e artifacts/update.zip ]]'
+        - git fetch --tags
         - export TAG=${CI_COMMIT_TAG:-${TAG:-$(.gitlab-ci/tools/console show-next-tag --minimum-stability "$MINIMUM_STABILITY")}}
         - >
             case $TAG in
@@ -120,6 +121,7 @@ Create-Release-Branch:
         - git config --global user.email $GIT_EMAIL
         - git config --global user.name $GIT_USER
         - composer install --working-dir=.gitlab-ci/tools
+        - git fetch --tags
         - export TAG=${TAG:-$(.gitlab-ci/tools/console show-next-tag --minimum-stability "$MINIMUM_STABILITY")}
     script:
         - export PROJECT_ROOT=$(pwd)