Merge branch 'add-build-server-support-for-additional-android-artifacts'

mullvad · Oct 20, 2023 · 2865b64 · 2865b64
2 parents 61f8d70 + 524f5cc
commit 2865b64
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/ci/buildserver-upload.sh b/ci/buildserver-upload.sh
@@ -38,7 +38,9 @@ while true; do
         files=$(awk '{print $2}' < "$checksums_path")
         for file in $files; do
             file_upload_dir="$upload_path/$version"
-            if [[ ! $file == MullvadVPN-* ]]; then
+            if [[ $platform == "desktop" && ! $file == MullvadVPN-* ]]; then
+                file_upload_dir="$file_upload_dir/additional-files"
+            elif [[ $platform == "android" && ! $file =~ MullvadVPN-"$version"(.apk|.play.aab) ]]; then
                 file_upload_dir="$file_upload_dir/additional-files"
             fi