1 files changed, 79 insertions, 18 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
+