Revert "Update Kokoro config to include Wear"

Author: riggaroo

build.sh

@@ -123,6 +123,21 @@ collect_artifacts() {
     cp "${aab_path}" "${artifact_dest_dir}/${aab_dest_file}"
     echo "SUCCESS: AAB copied to ${artifact_dest_dir}"
 
+    # Find and list the files before copying
+    # Store the find results in a variable to avoid running find twice
+    # and to handle the case where no files are found gracefully.
+    local intoto_files
+    intoto_files=$(find . -type f -name "*.intoto.jsonl")
+
+    if [ -n "$intoto_files" ]; then
+      echo "INFO: Found the following .intoto.jsonl files:"
+      echo "$intoto_files" # This will list each file on a new line
+      echo "INFO: Copying .intoto.jsonl files to ${artifact_dest_dir}/"
+      # Use print0 and xargs -0 for safe handling of filenames with spaces or special characters
+      find . -type f -name "*.intoto.jsonl" -print0 | xargs -0 -I {} cp {} "${artifact_dest_dir}/"
+    else
+      echo "INFO: No .intoto.jsonl files found."
+    fi
   else
     echo "FAILURE: AAB not found at ${aab_path}"
     exit 1

build_presubmit.sh

@@ -125,6 +125,21 @@ collect_artifacts() {
     cp "${aab_path}" "${artifact_dest_dir}/${aab_dest_file}"
     echo "SUCCESS: AAB copied to ${artifact_dest_dir}"
 
+    # Find and list the files before copying
+    # Store the find results in a variable to avoid running find twice
+    # and to handle the case where no files are found gracefully.
+    local intoto_files
+    intoto_files=$(find . -type f -name "*.intoto.jsonl")
+
+    if [ -n "$intoto_files" ]; then
+      echo "INFO: Found the following .intoto.jsonl files:"
+      echo "$intoto_files" # This will list each file on a new line
+      echo "INFO: Copying .intoto.jsonl files to ${artifact_dest_dir}/"
+      # Use print0 and xargs -0 for safe handling of filenames with spaces or special characters
+      find . -type f -name "*.intoto.jsonl" -print0 | xargs -0 -I {} cp {} "${artifact_dest_dir}/"
+    else
+      echo "INFO: No .intoto.jsonl files found."
+    fi
   else
     echo "FAILURE: AAB not found at ${aab_path}"
     exit 1

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 # build
-appVersionCode = "7"
-appVersionName = "1.1.5"
+appVersionCode = "6"
+appVersionName = "1.1.4"
 agp = "8.11.1"
 bcpkixJdk18on = "1.81"
 compileSdk = "36"

kokoro/gcp_ubuntu_docker/continuous.cfg

@@ -1,27 +1,12 @@
 build_file: "androidify/kokoro/gcp_ubuntu_docker/kokoro_build.sh"
 
-
-fileset_artifacts {
-  name: "androidify_phone_aab"
-  artifact_globs: "artifacts/app-release-unsigned.aab"
-  artifact_globs: "artifacts/app-release.spdx.json"
-  destinations {
-    store_attestation: true
-    gcs {
-      gcs_root_path: "androidify-app-prod-kokoro-artifacts/gcp_ubuntu_docker/continuous/mobile"
-    }
+action {
+  define_artifacts {
+    regex: "artifacts/**.aab"
+    regex: "artifacts/**.intoto.jsonl"
+    sbom_regex: "artifacts/app-release.spdx.json"
+    # Optional: Removes the "artifacts/" part from the path in the artifact storage
+    strip_prefix: "artifacts"
+    fail_if_no_artifacts: true
   }
 }
-
-# Fileset for the Wear OS App AAB
-fileset_artifacts {
-  name: "androidify_wear_aab"
-  artifact_globs: "artifacts/wear-release-unsigned.aab"
-  destinations {
-    store_attestation: true
-    gcs {
-      gcs_root_path: "androidify-app-prod-kokoro-artifacts/gcp_ubuntu_docker/continuous/wear"
-    }
-  }
-}
-

kokoro/gcp_ubuntu_docker/presubmit.cfg

@@ -1,25 +1,12 @@
 build_file: "androidify/kokoro/gcp_ubuntu_docker/kokoro_presubmit_build.sh"
 
-fileset_artifacts {
-  name: "androidify_phone_aab"
-  artifact_globs: "artifacts/app-release-unsigned.aab"
-  artifact_globs: "artifacts/app-release.spdx.json"
-  destinations {
-    store_attestation: true
-    gcs {
-      gcs_root_path: "androidify-app-prod-kokoro-artifacts/gcp_ubuntu_docker/presubmit/mobile"
-    }
-  }
-}
-
-# Fileset for the Wear OS App AAB
-fileset_artifacts {
-  name: "androidify_wear_aab"
-  artifact_globs: "artifacts/wear-release-unsigned.aab"
-  destinations {
-    store_attestation: true
-    gcs {
-      gcs_root_path: "androidify-app-prod-kokoro-artifacts/gcp_ubuntu_docker/presubmit/wear"
-    }
+action {
+  define_artifacts {
+    regex: "artifacts/**.aab"
+    regex: "artifacts/**.intoto.jsonl"
+    sbom_regex: "artifacts/app-release.spdx.json"
+    # Optional: Removes the "artifacts/" part from the path in the artifact storage
+    strip_prefix: "artifacts"
+    fail_if_no_artifacts: true
   }
 }

kokoro/gcp_ubuntu_docker/release.cfg

@@ -1,25 +1,13 @@
 build_file: "androidify/kokoro/gcp_ubuntu_docker/kokoro_build.sh"
 
-fileset_artifacts {
-  name: "androidify_phone_aab"
-  artifact_globs: "artifacts/app-release-unsigned.aab"
-  artifact_globs: "artifacts/app-release.spdx.json"
-  destinations {
-    store_attestation: true
-    gcs {
-      gcs_root_path: "androidify-app-prod-kokoro-artifacts/gcp_ubuntu_docker/release/mobile"
-    }
-  }
-}
+action {
+  define_artifacts {
+    regex: "artifacts/**.aab"
+    regex: "artifacts/**.intoto.jsonl"
+    sbom_regex: "artifacts/app-release.spdx.json"
 
-# Fileset for the Wear OS App AAB
-fileset_artifacts {
-  name: "androidify_wear_aab"
-  artifact_globs: "artifacts/wear-release-unsigned.aab"
-  destinations {
-    store_attestation: true
-    gcs {
-      gcs_root_path: "androidify-app-prod-kokoro-artifacts/gcp_ubuntu_docker/release/wear"
-    }
+    # Optional: Removes the "artifacts/" part from the path in the artifact storage
+    strip_prefix: "artifacts"
+    fail_if_no_artifacts: true
   }
 }