Build F-Droid build first, don't build debug versions anymore

.gitlab-ci.yml

@@ -10,25 +10,10 @@ stages:
 before_script:
   - source /home/public/android-sdk-linux/initAndroid.sh -s ${ANDROID_COMPILE_SDK}
 
-
-build_debug:
-  stage: build
-  script:
-    - /./home/public/gitrunner/changeAppVersion.sh app/build.gradle " $CI_COMMIT_REF_NAME\_$CI_PIPELINE_ID" --append
-    - ./gradlew assembleNormalDebug --stacktrace
-  artifacts:
-    paths:
-    - app/build/outputs/apk/normal/debug/*.apk
-  except:
-    - /^no_ci.*$/
-    - /^no_build.*$/
-    - /^no_build_no_tests.*$/
-    - /^no_build_no_deploy.*$/
-
-build_release:
+build_fdroid:
   stage: build
   script:
-   - ./gradlew clean checkNormalRelease assembleNormalRelease --stacktrace -x test
+    - ./gradlew clean checkAdblockerFdroid assembleAdblockerFdroid --stacktrace -x test
   except:
     - /^no_ci.*$/
     - /^no_build.*$/
@@ -36,15 +21,15 @@ build_release:
     - /^no_build_no_deploy.*$/
   artifacts:
     paths:
-    - app/build/outputs/apk/normal/release/*.apk
-    - app/build/outputs/mapping/normal/release/mapping.txt
+      - app/build/outputs/apk/adblocker/fdroid/*.apk
+      - app/build/outputs/mapping/adblocker/fdroid/mapping.txt
   only:
     - master
 
-build_fdroid:
+build_release:
   stage: build
   script:
-    - ./gradlew clean checkAdblockerFdroid assembleAdblockerFdroid --stacktrace -x test
+   - ./gradlew clean checkNormalRelease assembleNormalRelease --stacktrace -x test
   except:
     - /^no_ci.*$/
     - /^no_build.*$/
@@ -52,8 +37,8 @@ build_fdroid:
     - /^no_build_no_deploy.*$/
   artifacts:
     paths:
-      - app/build/outputs/apk/adblocker/fdroid/*.apk
-      - app/build/outputs/mapping/adblocker/fdroid/mapping.txt
+    - app/build/outputs/apk/normal/release/*.apk
+    - app/build/outputs/mapping/normal/release/mapping.txt
   only:
     - master