Compare only the report as there are version specific params in the JSON

This commit is contained in:
Julian Raufelder 2021-07-14 12:40:59 +02:00
parent 73bc1578d9
commit 6855507901
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
3 changed files with 28 additions and 20 deletions

View File

@ -2,6 +2,7 @@ fastlane_require 'dotenv'
fastlane_require 'jwt' fastlane_require 'jwt'
fastlane_require 'base64' fastlane_require 'base64'
fastlane_require 'net/sftp' fastlane_require 'net/sftp'
fastlane_require 'json'
default_platform(:android) default_platform(:android)
@ -213,35 +214,37 @@ platform :android do |options|
end end
desc "Check if tracking added in some dependency" desc "Check if tracking added in some dependency"
private lane :checkTrackingAddedInDependency do |options| lane :checkTrackingAddedInDependency do |options|
puts "Check if script file is latest" puts "Check if script file is latest"
sh("wget -O current_iod-scan-apk.php https://gitlab.com/fdroid/issuebot/-/raw/master/modules/iod-scan-apk.php") sh("wget -O current_iod-scan-apk.php https://gitlab.com/fdroid/issuebot/-/raw/master/modules/iod-scan-apk.php")
same_script = FileUtils.compare_file("iod-scan-apk.php", "current_iod-scan-apk.php") same_script = FileUtils.compare_file("iod-scan-apk.php", "current_iod-scan-apk.php")
if same_script if same_script
puts "Script file unchanged" puts "Script file unchanged"
FileUtils.rm("current_iod-scan-apk.php") FileUtils.rm("current_iod-scan-apk.php")
else else
UI.error("Script updated, check diff, download and save to iod-scan-apk.php") UI.error("Script updated, check diff, download and save to iod-scan-apk.php")
fail fail
end end
FileUtils.mkdir("unsigned") FileUtils.mkdir("unsigned")
FileUtils.cp(lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH], "unsigned/org.cryptomator_#{version}.apk") FileUtils.cp(lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH], "unsigned/org.cryptomator_#{version}.apk")
sh("ISSUEBOT_CURRENT_APPLICATION_ID=org.cryptomator ISSUEBOT_CURRENT_REPLY_FILE=current_result.json php iod-scan-apk.php") sh("ISSUEBOT_CURRENT_APPLICATION_ID=org.cryptomator ISSUEBOT_CURRENT_REPLY_FILE=current_result.json php iod-scan-apk.php")
# clean up # clean up
FileUtils.rm("libinfo.txt") FileUtils.rm("libinfo.txt")
FileUtils.rm("libsmali.txt") FileUtils.rm("libsmali.txt")
FileUtils.rm_r("unsigned") FileUtils.rm_r("unsigned")
FileUtils.rm_r("org.cryptomator_#{version}") FileUtils.rm_r("org.cryptomator_#{version}")
puts "Check if something changed in the APK regarding the dependencies" puts "Check if something changed in the APK regarding the dependencies"
same_files = FileUtils.compare_file("result.json", "current_result.json")
if same_files report = JSON.parse(File.read("result.json"))["report"]
current_report = JSON.parse(File.read("current_result.json"))["report"]
if report.eql?(current_report)
puts "Dependencies unchanged" puts "Dependencies unchanged"
FileUtils.rm("current_result.json") FileUtils.rm("current_result.json")
else else

View File

@ -41,6 +41,11 @@ Deploy new version to server
fastlane android deployToFDroid fastlane android deployToFDroid
``` ```
Deploy new version to F-Droid Deploy new version to F-Droid
### android checkTrackingAddedInDependency
```
fastlane android checkTrackingAddedInDependency
```
Check if tracking added in some dependency
### android createGitHubDraftRelease ### android createGitHubDraftRelease
``` ```
fastlane android createGitHubDraftRelease fastlane android createGitHubDraftRelease

File diff suppressed because one or more lines are too long