From 8856c30165ed6e5126f57d54a84ccf8fe6644b85 Mon Sep 17 00:00:00 2001
From: Johannes Loher <johannes.loher@fg4f.de>
Date: Sat, 9 Jan 2021 19:01:22 +0100
Subject: [PATCH] move technical stuff to before_script

---
 .gitlab-ci.yml  | 12 ++++++------
 src/system.json |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cdf3866..0d85bab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -73,15 +73,15 @@ deploy:
     before_script:
         - apt update
         - apt install --yes jq
+        - REPOSITORY_URL=$(echo "${CI_REPOSITORY_URL}" | sed -e "s|gitlab-ci-token:.*@|${RELEASE_TOKEN}:${RELEASE_TOKEN_SECRET}@|g")
+        - git remote set-url origin $REPOSITORY_URL
+        - git config user.name $GITLAB_USER_LOGIN
+        - git config user.email $GITLAB_USER_EMAIL
+        - git branch -D ci-processing || true
+        - git checkout -b ci-processing
     cache:
         <<: *global_cache
     script: |
-        REPOSITORY_URL=$(echo "${CI_REPOSITORY_URL}" | sed -e "s|gitlab-ci-token:.*@|${RELEASE_TOKEN}:${RELEASE_TOKEN_SECRET}@|g")
-        git remote set-url origin $REPOSITORY_URL
-        git config user.name $GITLAB_USER_LOGIN
-        git config user.email $GITLAB_USER_EMAIL
-        git branch -D ci-processing || true
-        git checkout -b ci-processing
         npm run updateManifest -- --update=${RELEASE_TYPE}
         RELEASE_VERSION=$(jq -r '.version' < package.json)
         git add package.json package-lock.json src/system.json
diff --git a/src/system.json b/src/system.json
index a64a1a8..e965367 100644
--- a/src/system.json
+++ b/src/system.json
@@ -22,7 +22,7 @@
     "gridUnits": "m",
     "primaryTokenAttribute": "combatValues.hitPoints",
     "url": "https://git.f3l.de/dungeonslayers/ds4",
-    "manifest": "https://git.f3l.de/dungeonslayers/ds4/-/raw/master/src/system.json?inline=false",
+    "manifest": "https://git.f3l.de/dungeonslayers/ds4/-/raw/latest/src/system.json?inline=false",
     "download": "https://git.f3l.de/dungeonslayers/ds4/-/jobs/artifacts/0.1.0/download?job=build",
     "license": "MIT"
 }