From 32578d46bea3e54cdd3021b0dd3fac4fb724267a Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 23 Nov 2023 23:13:17 +0100
Subject: cache library build artifacts and pass them to screenshot stage

---
 .gitlab-ci.yml                   | 8 +++-----
 scripts/prepareForScreenshots.sh | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 88c886c0..1422d90a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,7 +77,6 @@ screenshot:
   image: "0xacab.org:4567/leap/bitmask_android/android-fastlane:latest"
   stage: test
   when: always
-#  needs: ["docker_image:fastlane"]
   tags:
     - birch
   variables:
@@ -86,17 +85,15 @@ screenshot:
     ANDROID_EMULATOR_USE_SYSTEM_LIBS: 1
     DEBIAN_FRONTEN: "noninteractive"
 # try to re-use the build artifcats from before, lib building is slow
-#  dependencies:
-#    - build
+  dependencies:
+    - build
   script:
-    - ./scripts/prepareForScreenshots.sh
     - ./scripts/installFastlane.sh
     - ./scripts/startEmulators.sh
     - ./scripts/fastlane.sh
     - ./scripts/fastlane.sh custom
   artifacts:
     paths:
-      - app/build/screenshots
       - src/custom/
       - src/normal/
     when: always
@@ -148,6 +145,7 @@ build:
     - ./scripts/build_deps.sh >> build_deps.log 2>&1
     - ./gradlew clean assembleNormalProductionFatDebug -debug >> build.log 2>&1
   artifacts:
+    untracked: true
     paths:
     - app/build/outputs/
     - build_deps.log
diff --git a/scripts/prepareForScreenshots.sh b/scripts/prepareForScreenshots.sh
index c2ae1bd5..0b38cfae 100755
--- a/scripts/prepareForScreenshots.sh
+++ b/scripts/prepareForScreenshots.sh
@@ -26,4 +26,4 @@ git submodule foreach --recursive git reset --hard HEAD
 git submodule sync --recursive
 git submodule update --init --recursive
 
-BUILD_TOR=false BUILD_OPENVPN_LIBS=false ./scripts/build_deps.sh
+./scripts/build_deps.sh
-- 
cgit v1.2.3