From 9d0bbe4d113e9d2d0434dd9446ffb662cbe835ea Mon Sep 17 00:00:00 2001
From: Stefan Schueller <sschueller@nunight.com>
Date: Sun, 12 Jul 2020 15:26:32 +0200
Subject: [PATCH] Fastlane

---
 .gitlab-ci.yml | 60 ++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 024eec9..b2772f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,33 +8,32 @@ stages:
   - production
   - stop
 
-#
-#.updateContainerJob:
-#  image: docker:stable
-#  stage: environment
-#  services:
-#    - docker:dind
-#  script:
-#    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-#    - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG || true
-#    - docker build --cache-from $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .
-#    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
-#
-#updateContainer:
-#  extends: .updateContainerJob
-#  only:
-#    changes:
-#      - Dockerfile
-#
-#ensureContainer:
-#  extends: .updateContainerJob
-#  allow_failure: true
-#  before_script:
-#    - "mkdir -p ~/.docker && echo '{\"experimental\": \"enabled\"}' > ~/.docker/config.json"
-#    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-#    # Skip update container `script` if the container already exists
-#    # via https://gitlab.com/gitlab-org/gitlab-ce/issues/26866#note_97609397 -> https://stackoverflow.com/a/52077071/796832
-#    - docker manifest inspect $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG > /dev/null && exit || true
+.updateContainerJob:
+  image: docker:stable
+  stage: environment
+  services:
+    - docker:dind
+  script:
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG || true
+    - docker build --cache-from $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .
+    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+
+updateContainer:
+  extends: .updateContainerJob
+  only:
+    changes:
+      - Dockerfile
+
+ensureContainer:
+  extends: .updateContainerJob
+  allow_failure: true
+  before_script:
+    - "mkdir -p ~/.docker && echo '{\"experimental\": \"enabled\"}' > ~/.docker/config.json"
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    # Skip update container `script` if the container already exists
+    # via https://gitlab.com/gitlab-org/gitlab-ce/issues/26866#note_97609397 -> https://stackoverflow.com/a/52077071/796832
+    - docker manifest inspect $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG > /dev/null && exit || true
 
 .build_job:
   image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
@@ -59,7 +58,6 @@ stages:
 
 
 buildDebug:
-  image: vratislav/gitlab-ci-fastlane-android
   extends: .build_job
   script:
     - bundle exec fastlane buildDebug
@@ -79,7 +77,7 @@ buildRelease:
     name: production
 
 testDebug:
-#  image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+  image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
   stage: test
   dependencies:
     - buildDebug
@@ -87,7 +85,7 @@ testDebug:
     - bundle exec fastlane test
 
 publishInternal:
-#  image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+  image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
   stage: internal
   dependencies:
     - buildRelease
@@ -100,7 +98,7 @@ publishInternal:
     - bundle exec fastlane internal
 
 .promote_job:
-#  image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+  image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
   when: manual
   dependencies: []
   before_script: