diff --git a/build.sh b/build.sh index baa32857..ea8f29c8 100755 --- a/build.sh +++ b/build.sh @@ -123,21 +123,6 @@ 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 diff --git a/build_presubmit.sh b/build_presubmit.sh index cd382605..0ae803af 100755 --- a/build_presubmit.sh +++ b/build_presubmit.sh @@ -125,21 +125,6 @@ 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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c523f4d0..8ece1e63 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] # build -appVersionCode = "6" -appVersionName = "1.1.4" +appVersionCode = "7" +appVersionName = "1.1.5" agp = "8.11.1" bcpkixJdk18on = "1.81" compileSdk = "36" diff --git a/kokoro/gcp_ubuntu_docker/continuous.cfg b/kokoro/gcp_ubuntu_docker/continuous.cfg index 9597201a..2c3f5b7a 100644 --- a/kokoro/gcp_ubuntu_docker/continuous.cfg +++ b/kokoro/gcp_ubuntu_docker/continuous.cfg @@ -1,12 +1,27 @@ build_file: "androidify/kokoro/gcp_ubuntu_docker/kokoro_build.sh" -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_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" + } } } + +# 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" + } + } +} + diff --git a/kokoro/gcp_ubuntu_docker/presubmit.cfg b/kokoro/gcp_ubuntu_docker/presubmit.cfg index db988ad8..f74c32ac 100644 --- a/kokoro/gcp_ubuntu_docker/presubmit.cfg +++ b/kokoro/gcp_ubuntu_docker/presubmit.cfg @@ -1,12 +1,25 @@ build_file: "androidify/kokoro/gcp_ubuntu_docker/kokoro_presubmit_build.sh" -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_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" + } } } diff --git a/kokoro/gcp_ubuntu_docker/release.cfg b/kokoro/gcp_ubuntu_docker/release.cfg index 51193bf1..db0d3f63 100644 --- a/kokoro/gcp_ubuntu_docker/release.cfg +++ b/kokoro/gcp_ubuntu_docker/release.cfg @@ -1,13 +1,25 @@ build_file: "androidify/kokoro/gcp_ubuntu_docker/kokoro_build.sh" -action { - define_artifacts { - regex: "artifacts/**.aab" - regex: "artifacts/**.intoto.jsonl" - sbom_regex: "artifacts/app-release.spdx.json" +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" + } + } +} - # 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/release/wear" + } } }