From 0b5193f3bd84df957337e703445a6dadd30e4f55 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sun, 31 Jan 2021 21:51:29 +0100
Subject: move more scripts to scripts folder, adapt gitlab ci and
 prepare_for_distribution script

---
 .gitlab-ci.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b9ac51a6..1d358b22 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,9 +102,9 @@ build:
   image: "0xacab.org:4567/leap/bitmask_android/android-ndk:latest"
   stage: build
   script:
-    - ./cleanProject.sh
-    - ./build_deps.sh >> build_deps.log 2>&1
-    - ./gradlew clean assembleNormalProductionFatDebug --stacktrace >> build.log 2>&1
+    - ./scripts/cleanProject.sh
+    - ./scripts/build_deps.sh >> build_deps.log 2>&1
+    - ./scripts/gradlew clean assembleNormalProductionFatDebug --stacktrace >> build.log 2>&1
   artifacts:
     paths:
     - app/build/outputs/
@@ -117,7 +117,7 @@ build_release:
   image: "0xacab.org:4567/leap/bitmask_android/android-ndk:latest"
   stage: build
   script:
-    - ./prepareForDistribution.sh build -no-tag >> normalRelease.log 2>&1
+    - ./scripts/prepareForDistribution.sh build -no-tag >> normalRelease.log 2>&1
   artifacts:
     paths:
       - app/build/outputs/
@@ -131,7 +131,7 @@ build_fdroid_beta_release:
   image: "0xacab.org:4567/leap/bitmask_android/android-ndk:latest"
   stage: build
   script:
-    - ./prepareForDistribution.sh build -no-tag -beta >> normalBeta.log 2>&1
+    - ./scripts/prepareForDistribution.sh build -no-tag -beta >> normalBeta.log 2>&1
   artifacts:
     paths:
       - app/build/outputs/
@@ -145,7 +145,7 @@ build_custom_release:
   image: "0xacab.org:4567/leap/bitmask_android/android-ndk:latest"
   stage: build
   script:
-    - ./prepareForDistribution.sh build -no-tag -custom >> customRelease.log 2>&1
+    - ./scripts/prepareForDistribution.sh build -no-tag -custom >> customRelease.log 2>&1
   artifacts:
     paths:
     - app/build/outputs/
@@ -159,7 +159,7 @@ build_fdroid_custom_beta_release:
   image: "0xacab.org:4567/leap/bitmask_android/android-ndk:latest"
   stage: build
   script:
-    - ./prepareForDistribution.sh build -no-tag -beta -custom >> customBeta.log 2>&1
+    - ./scripts/prepareForDistribution.sh build -no-tag -beta -custom >> customBeta.log 2>&1
   artifacts:
     paths:
       - app/build/outputs/
@@ -167,4 +167,4 @@ build_fdroid_custom_beta_release:
       - customBeta.log
     when: always
     expire_in: 1 week
-  when: manual
\ No newline at end of file
+  when: manual
-- 
cgit v1.2.3