From ca8349e1b2d19970008787cff07d1e1fd9389682 Mon Sep 17 00:00:00 2001
From: Lawrence Nahum <lawrence@greenaddress.it>
Date: Wed, 11 Dec 2019 21:34:07 +0100
Subject: [PATCH] Revert "run only android or ios debug builds [android-test]
 [ios-test]"

This reverts commit 20ba801107e28c2e8c5e58ad3ee2eff514cab798.
---
 .gitlab-ci.yml | 101 ++++---------------------------------------------
 1 file changed, 7 insertions(+), 94 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 333582516..7457bcd96 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,31 +15,10 @@ stages:
   image: greenaddress/fedora_ci@sha256:120c1da342ed28f6b03d87e27d407407f6533d6836a0c3342634a6a46e15fc41
   tags:
     - ga
-  except:
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /[android-test]/
-      - $CI_COMMIT_MESSAGE =~ /[ios-test]/
 
 .ndk_release:
   tags:
     - ga
-  except:
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /[android-test]/
-      - $CI_COMMIT_MESSAGE =~ /[ios-test]/
-  artifacts:
-    name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
-    expire_in: 1 day
-    when: on_success
-    paths:
-    - gdk-android-jni
-
-.ndk_debug:
-  tags:
-    - ga
-  only:
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /[android-test]/
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     expire_in: 1 day
@@ -50,10 +29,6 @@ stages:
 .osx_test:
   tags:
     - osx
-  except:
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /[android-test]/
-      - $CI_COMMIT_MESSAGE =~ /[ios-test]/
   cache:
     key: "$CI_JOB_NAME"
     paths:
@@ -62,10 +37,6 @@ stages:
 .py_release:
   tags:
     - ga
-  except:
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /[android-test]/
-      - $CI_COMMIT_MESSAGE =~ /[ios-test]/
   before_script:
     - mkdir $CI_PROJECT_DIR/gdk-python
   artifacts:
@@ -86,21 +57,6 @@ stages:
     paths:
     - gdk-iphone
 
-.ios_debug:
-  tags:
-    - osx
-  only:
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /[ios-test]/
-  before_script:
-    - mkdir $CI_PROJECT_DIR/gdk-iphone
-  artifacts:
-    name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
-    expire_in: 1 day
-    when: on_success
-    paths:
-    - gdk-iphone
-
 test_format:
   tags:
     - ga
@@ -111,10 +67,6 @@ test_format:
 test_gcc:
   tags:
     - ga
-  except:
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /[android-test]/
-      - $CI_COMMIT_MESSAGE =~ /[ios-test]/
   script:
     - ./tools/build.sh --gcc
 
@@ -164,10 +116,6 @@ test_fedora_clang:
 test_clang:
   tags:
     - ga
-  except:
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /[android-test]/
-      - $CI_COMMIT_MESSAGE =~ /[ios-test]/
   script:
     - ./tools/build.sh --clang
 
@@ -183,6 +131,13 @@ gdk_clang_ndk_arm64-v8a:
     - mkdir gdk-android-jni
     - ANDROID_NDK=/android-ndk-r20b ./tools/build.sh --install $PWD/gdk-android-jni --ndk arm64-v8a --lto=true
 
+gdk_clang_ndk_arm64-v8a-debug:
+  extends: .ndk_release
+  when: manual
+  script:
+    - mkdir gdk-android-jni
+    - ANDROID_NDK=/android-ndk-r20b ./tools/build.sh --buildtype=debug --install $PWD/gdk-android-jni --ndk arm64-v8a --lto=true
+
 gdk_clang_ndk_x86:
   extends: .ndk_release
   script:
@@ -195,18 +150,6 @@ gdk_clang_ndk_x86_64:
     - mkdir gdk-android-jni
     - ANDROID_NDK=/android-ndk-r20b ./tools/build.sh --install $PWD/gdk-android-jni --ndk x86_64 --lto=true
 
-gdk_clang_ndk_arm64-v8a-debug:
-  extends: .ndk_debug
-  script:
-    - mkdir gdk-android-jni
-    - ANDROID_NDK=/android-ndk-r20b ./tools/build.sh --buildtype=debug --install $PWD/gdk-android-jni --ndk arm64-v8a --lto=true
-
-gdk_clang_ndk_x86:
-  extends: .ndk_debug
-  script:
-    - mkdir gdk-android-jni
-    - ANDROID_NDK=/android-ndk-r20b ./tools/build.sh buildtype=debug --install $PWD/gdk-android-jni --ndk x86 --lto=true
-
 test_osx_clang:
   extends: .osx_test
   script:
@@ -228,20 +171,6 @@ release_osx_ios_sim:
     - ./tools/clean.sh dirs
     - ./tools/build.sh --iphonesim static --lto=true --install $PWD/gdk-iphone
 
-debug_osx_ios:
-  extends: .ios_debug
-  script:
-    - cd $CI_PROJECT_DIR
-    - ./tools/clean.sh dirs
-    - ./tools/build.sh --buildtype=debug --iphone static --lto=true --install $PWD/gdk-iphone
-
-debug_osx_ios_sim:
-  extends: .ios_debug
-  script:
-    - cd $CI_PROJECT_DIR
-    - ./tools/clean.sh dirs
-    - ./tools/build.sh --buildtype=debug --iphonesim static --lto=true --install $PWD/gdk-iphone
-
 test_osx_clang_ndk_armeabi-v7a:
   only:
     refs:
@@ -285,10 +214,6 @@ test_osx_clang_ndk_x86_64:
 test_freebsd_gcc:
   tags:
     - freebsd
-  except:
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /[android-test]/
-      - $CI_COMMIT_MESSAGE =~ /[ios-test]/
   script:
     - cd $CI_PROJECT_DIR
     - ./tools/build.sh --gcc
@@ -296,10 +221,6 @@ test_freebsd_gcc:
 test_freebsd_clang:
   tags:
     - freebsd
-  except:
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /[android-test]/
-      - $CI_COMMIT_MESSAGE =~ /[ios-test]/
   before_script:
     - export PATH="/usr/local/llvm60/bin:$PATH"
   script:
@@ -309,10 +230,6 @@ test_freebsd_clang:
 test_windows_mingw_w64_cross:
   tags:
     - ga
-  except:
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /[android-test]/
-      - $CI_COMMIT_MESSAGE =~ /[ios-test]/
   artifacts:
     expire_in: 1 hour
     when: on_success
@@ -340,10 +257,6 @@ apidocs:
 package_release:
   tags:
     - garelease
-  except:
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /[android-test]/
-      - $CI_COMMIT_MESSAGE =~ /[ios-test]/
   stage: deploy
   artifacts:
     name: "$CI_PROJECT_NAME-$CI_COMMIT_SHORT_SHA"