From 00ed0d6d253808eeb82e00a3f4ab2d071d8a8d22 Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Sat, 21 Nov 2020 12:45:14 +0000
Subject: [PATCH] chore: fix CI

---
 .gitlab-ci.yml                     | 4 +++-
 scripts/build-android-apk.sh       | 1 -
 scripts/build-android-appbundle.sh | 1 -
 scripts/build-web.sh               | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a0dfce81..c3f103f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ test:
 build_web:
   stage: coverage
   image: registry.gitlab.com/famedly/containers/flutter-dockerimages:beta
-  before_script: [sudo apt update && sudo apt install curl -y]
+  before_script: [sudo apt update && sudo apt install curl -y, ./scripts/prepare-web.sh]
   script: [./scripts/build-web.sh]
   artifacts:
     paths:
@@ -66,6 +66,7 @@ build_android_debug:
 
 build_android_apk:
   stage: coverage
+  before_script: [./scripts/prepare-android-release.sh]
   script: [./scripts/build-android-apk.sh]
   variables:
     FDROID_KEY: ${FDROID_KEY}
@@ -81,6 +82,7 @@ build_android_apk:
 
 build_android_appbundle:
   stage: coverage
+  before_script: [./scripts/prepare-android-release.sh]
   script: [./scripts/build-android-appbundle.sh]
   variables:
     FDROID_KEY: ${FDROID_KEY}
diff --git a/scripts/build-android-apk.sh b/scripts/build-android-apk.sh
index d784c4ff..3dfb4e02 100755
--- a/scripts/build-android-apk.sh
+++ b/scripts/build-android-apk.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-/bin/bash ./scripts/prepare-android-release.sh
 flutter channel stable
 flutter upgrade
 flutter pub get
diff --git a/scripts/build-android-appbundle.sh b/scripts/build-android-appbundle.sh
index fa4d16f2..43512b85 100755
--- a/scripts/build-android-appbundle.sh
+++ b/scripts/build-android-appbundle.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-/bin/bash ./scripts/prepare-android-release.sh
 flutter channel stable
 flutter upgrade
 flutter pub get
diff --git a/scripts/build-web.sh b/scripts/build-web.sh
index 2b8fc7c8..787c07d3 100755
--- a/scripts/build-web.sh
+++ b/scripts/build-web.sh
@@ -2,7 +2,6 @@
 flutter channel beta
 flutter upgrade
 flutter config --enable-web
-/bin/bash ./scripts/prepare-web.sh
 flutter clean
 flutter pub get
-flutter build web --release --verbose
\ No newline at end of file
+flutter build web --release --verbose