Run fluidattacks lane during dryRun as well

Author: SailReal

fastlane/Fastfile

@@ -295,7 +295,7 @@ platform :android do |options|
   desc "Deploy new lite version"
   private_lane :deployLite do |options|
     sh("docker build -t cryptomator-android ../buildsystem")
-    sh("docker run --rm -u $(id -u):$(id -g) -v $(cd .. && pwd):/project -w /project cryptomator-android ./gradlew clean assembleLiteRelease")
+    sh("docker run --rm -v $(cd .. && pwd):/project -w /project cryptomator-android ./gradlew clean assembleLiteRelease")
 
     sh("zipalign -v -p 4 ../presentation/build/outputs/apk/lite/release/presentation-lite-release-unsigned.apk presentation-lite-release-unsigned-aligned.apk")
     sh("apksigner sign --ks #{ENV["SIGNING_KEYSTORE_PATH"]} --ks-key-alias #{ENV["SIGNING_KEY_ALIAS"]} --ks-pass env:SIGNING_KEYSTORE_PASSWORD --key-pass env:SIGNING_KEY_PASSWORD --out release/Cryptomator-#{version}_lite_signed.apk presentation-lite-release-unsigned-aligned.apk")
@@ -366,20 +366,23 @@ platform :android do |options|
 
   desc "Run fluidattacks"
   lane :runFluidattacks do |options|
-    # if you want to run it for a specific version just set e.g. version = "1.10.0"
-    fluidattacks_apks_path = "fluidattacks/apks"
-    apk_types = %w[signed fdroid_signed lite_signed playstore_signed]
-
-    FileUtils.mkdir("#{fluidattacks_apks_path}")
-    apk_types.each do |type|
-      FileUtils.mkdir("#{fluidattacks_apks_path}/Cryptomator-#{version}_#{type}/")
-      FileUtils.cp("release/Cryptomator-#{version}_#{type}.apk", "#{fluidattacks_apks_path}/Cryptomator-#{version}_#{type}/")
+    if !options[:verifyOnly]
+      fluidattacks_apks_path = "fluidattacks/apks"
+      apk_types = %w[signed fdroid_signed lite_signed playstore_signed]
+
+      FileUtils.mkdir("#{fluidattacks_apks_path}")
+      apk_types.each do |type|
+        FileUtils.mkdir("#{fluidattacks_apks_path}/Cryptomator-#{version}_#{type}/")
+        FileUtils.cp("release/Cryptomator-#{version}_#{type}.apk", "#{fluidattacks_apks_path}/Cryptomator-#{version}_#{type}/")
+      end
     end
 
     puts "Run Fluidattacks. Results are in /src/fastlane/fluidattacks/results.csv"
     sh("docker run -v $(cd .. && pwd):/src -w /src fluidattacks/cli:amd64 skims scan /src/fastlane/fluidattacks/config.yaml")
 
-    FileUtils.rm_r("#{fluidattacks_apks_path}")
+    if !options[:verifyOnly]
+      FileUtils.rm_r("#{fluidattacks_apks_path}")
+    end
   end
 
   desc "Create GitHub draft release"
@@ -419,6 +422,14 @@ platform :android do |options|
 
     checkVersionCodeSet(alpha:options[:alpha], beta:options[:beta])
 
+    fluidattacks_apks_path = "fluidattacks/apks"
+    apk_types = %w[signed fdroid_signed lite_signed playstore_signed]
+
+    FileUtils.mkdir("#{fluidattacks_apks_path}")
+    apk_types.each do |type|
+      FileUtils.mkdir("#{fluidattacks_apks_path}/Cryptomator-#{version}_#{type}/")
+    end
+
     gradle(task: "clean")
 
     gradle(
@@ -437,6 +448,8 @@ platform :android do |options|
     checkTrackingAddedInDependencyUsingIzzyScript(alpha:options[:alpha], beta:options[:beta], flavor: 'playstore')
     checkTrackingAddedInDependencyUsingExodus(alpha:options[:alpha], beta:options[:beta], flavor: 'playstore')
 
+    FileUtils.cp(lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH], "#{fluidattacks_apks_path}/Cryptomator-#{version}_playstore_signed/Cryptomator-#{version}_playstore_signed.apk")
+
     gradle(task: "clean")
 
     gradle(
@@ -455,6 +468,8 @@ platform :android do |options|
     checkTrackingAddedInDependencyUsingIzzyScript(alpha:options[:alpha], beta:options[:beta], flavor: 'apkstore')
     checkTrackingAddedInDependencyUsingExodus(alpha:options[:alpha], beta:options[:beta], flavor: 'apkstore')
 
+    FileUtils.cp(lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH], "#{fluidattacks_apks_path}/Cryptomator-#{version}_signed/Cryptomator-#{version}_signed.apk")
+
     gradle(task: "clean")
 
     gradle(
@@ -473,6 +488,8 @@ platform :android do |options|
     checkTrackingAddedInDependencyUsingIzzyScript(alpha:options[:alpha], beta:options[:beta], flavor: 'fdroid')
     checkTrackingAddedInDependencyUsingExodus(alpha:options[:alpha], beta:options[:beta], flavor: 'fdroid')
 
+    FileUtils.cp(lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH], "#{fluidattacks_apks_path}/Cryptomator-#{version}_fdroid_signed/Cryptomator-#{version}_fdroid_signed.apk")
+
     gradle(task: "clean")
 
     gradle(
@@ -490,5 +507,11 @@ platform :android do |options|
 
     checkTrackingAddedInDependencyUsingIzzyScript(alpha:options[:alpha], beta:options[:beta], flavor: 'lite')
     checkTrackingAddedInDependencyUsingExodus(alpha:options[:alpha], beta:options[:beta], flavor: 'lite')
+
+    FileUtils.cp(lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH], "#{fluidattacks_apks_path}/Cryptomator-#{version}_lite_signed/Cryptomator-#{version}_lite_signed.apk")
+
+    runFluidattacks(verifyOnly:true)
+
+    FileUtils.rm_r("#{fluidattacks_apks_path}")
   end
 end

fastlane/README.md

@@ -55,14 +55,6 @@ Update Metadata
 
 Check if the version code was set
 
-### android deployToLenotraAG
-
-```sh
-[bundle exec] fastlane android deployToLenotraAG
-```
-
-Deploy new version to Lenotra AG
-
 ### android checkTrackingAddedInDependencyUsingIzzyScript
 
 ```sh