CI test using CI variables

2 files changed, 90 insertions, 23 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4606887..c205944 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,30 +1,91 @@
 stages:
+  - test
   - build
-#  - test
-#  - deploy
-#  - release
+  - deploy
+
+# --- globals -----------------------------------------------------------------
+
+variables:
+  CROSS: i686-w64-mingw32.shared
+  MP_REPOSITORY: https://gitlab.com/jak89_1/manaplus.git
+
+.job-deploy: &job-deploy
+  artifacts:
+    paths:
+    - build
+    - logs
+    - public
+    when: always
+    expire_in: 3 week
+
+.job-build: &job-build
+  artifacts:
+    paths:
+    - build
+    - logs
+    when: always
+    expire_in: 3 week
+
+.job-test: &job-test
+  artifacts:
+    paths:
+    - logs
+    when: always
+    expire_in: 3 week
+
+# --- jobs --------------------------------------------------------------------
 
 mxe_gcc5:
-  image: registry.gitlab.com/jak89_1/docker-testing:v1.0.4
+  image: $CI_REGISTRY_IMAGE:v1.0.4
   stage: build
-  only:
-    - branches@jak89_1/docker-testing
+  except:
+    - /^test.*/
+    - /^registry.*/
   script:
     - cd /
-    - mkdir -p /builds/jak89_1/docker-testing/logs/ || true
-    - mkdir -p /builds/jak89_1/docker-testing/build/ || true
-    - git clone https://gitlab.com/jak89_1/docker-testing.git -b $CI_COMMIT_BRANCH /opt || exit 1
+    - mkdir -p "${CI_PROJECT_DIR}/logs/" || true
+    - mkdir -p "${CI_PROJECT_DIR}/build/" || true
+    - git clone $CI_REPOSITORY_URL -b $CI_COMMIT_BRANCH /opt || exit 1
     - rm -rf /opt/.git/
     - mv -f opt/* /
-    - git clone https://gitlab.com/jak89_1/manaplus.git -b master || exit 1
+    - git clone $MP_REPOSITORY -b master || exit 1
     - chmod +x ./manaplus.sh && ./manaplus.sh
-  variables:
-    CROSS: i686-w64-mingw32.shared
-  artifacts:
-    paths:
-      - build
-      - logs
-    when: always
-    expire_in: 3 week
+  <<: *job-build
   tags:
     - docker
+
+pages:
+  image: alpine
+  stage: deploy
+  only:
+    - stable
+    - release
+  script:
+    - echo "[WIP] mirror"
+    - exit 1
+  <<: *job-deploy
+  allow_failure: true
+
+registry_deploy:
+  image: alpine
+  stage: deploy
+  only:
+    - /^registry_.*/
+    - /^registry/.*/
+  script:
+    - echo "[WIP]"
+    - exit 1
+  <<: *job-test
+  allow_failure: true
+
+test_only:
+  image: alpine
+  stage: test
+  only:
+    - /^test_.*/
+    - /^test/.*/
+  script:
+    - echo "ci testing should use branches named test_* (doesnt trigger mxe_gcc5 build)"
+  <<: *job-test
+  allow_failure: true
+
diff --git a/manaplus.sh b/manaplus.sh
index 215340b..0bc7d9f 100644
--- a/manaplus.sh
+++ b/manaplus.sh
@@ -16,6 +16,10 @@ dll_check(){
 # CI_COMMIT_TAG="v2.1.1.1"  # <- test version
 # CI_COMMIT_TAG="s20210101" # <- test snapshot2
 get_version_by_tag(){
+    latest_tag=`git -c 'versionsort.suffix=-' \
+        ls-remote --exit-code --refs --sort='version:refname' --tags ${MP_REPOSITORY} '*.*.*' \
+        | tail --lines=1 \
+        | cut --delimiter='/' --fields=3`
     IFS='.' read -r -a array <<< "$CI_COMMIT_TAG" # splits commit tag in array
     [ "${CI_COMMIT_TAG:0:1}" == "v" ] \
         && V="${array[0]:1}.${array[1]}.${array[2]}.${array[3]}" # add dots to version
@@ -23,6 +27,7 @@ get_version_by_tag(){
         && V="snapshot-${CI_COMMIT_TAG:1}" # just replace 's' with 'snapshot-'
     [ "${CI_COMMIT_TAG}"     == ""  ] \
         && echo "!WARN: no tag set, using test-0.0.0.1!" \
+        && echo "latest tag: '${latest_tag}' on '${MP_REPOSITORY}' master" \
         && V="test-0.0.0.1" # test versions, (not running from tags)
     export PRODUCT_VERSION=$V
     export VERSION=$V
@@ -77,8 +82,9 @@ make_portable $dll_dir
 #./packwin || exit 1 # disabled (not required @mana-launcher)
 
 # artifacts
-#cp /manaplus/packaging/windows/manaplus-*.exe /builds/jak89_1/docker-testing/build/ || exit 1
-cp /tmp/*.zip /builds/jak89_1/docker-testing/build/ || exit 1 # copy portable client zip file
-# TODO: checksum [zip->sha->{version?}.sha] /builds/jak89_1/docker-testing/build/
-cp /manaplus/build/tmp/config.log /builds/jak89_1/docker-testing/logs/ || true
-cp /manaplus/build/make2.log /builds/jak89_1/docker-testing/logs/ || true
+#cp /manaplus/packaging/windows/manaplus-*.exe ${CI_PROJECT_DIR}/build/ || exit 1
+cp /tmp/*.zip ${CI_PROJECT_DIR}/build/ || exit 1 # copy portable client zip file
+# TODO: checksum [zip->sha->{version?}.sha] ${CI_PROJECT_DIR}/build/
+cp /manaplus/build/tmp/config.log ${CI_PROJECT_DIR}/logs/ || true
+cp /manaplus/build/make2.log ${CI_PROJECT_DIR}/logs/ || true
+