Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Copy Cobalt binary and APK to GCS #4621

Merged
merged 1 commit into from
Dec 21, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 3 additions & 18 deletions cobalt/devinfra/kokoro/bin/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -265,19 +265,9 @@ create_and_upload_nightly_archive () {
fi
local gcs_archive_path="gs://$(get_bucket_name)/${platform}${gcs_path_suffix}/$(date +%F)/${KOKORO_ROOT_BUILD_NUMBER}/"

# Creates nightly archive from package directory.
python3 "${WORKSPACE_COBALT}/tools/create_archive.py" \
-s "${package_dir}" \
-d "${local_archive_path}" \
--intermediate

init_gcloud

# Uploads nightly archive.
"${GSUTIL}" cp "${local_archive_path}" "${gcs_archive_path}"

# Uploads build_info.json.
"${GSUTIL}" cp "${build_info_path}" "${gcs_archive_path}"
"${GSUTIL}" cp -r "${package_dir}" "${gcs_archive_path}"
}

run_package_release_pipeline () {
Expand All @@ -300,11 +290,7 @@ run_package_release_pipeline () {

# Create release package.
if [[ "${PLATFORM}" =~ "android" ]]; then
# Creates Android package directory.
python3 "${WORKSPACE_COBALT}/cobalt/devinfra/kokoro/build/android/simple_packager.py" \
"${out_dir}" \
"${package_dir}" \
"${WORKSPACE_COBALT}"
cp "${out_dir}/apks/Cobalt.apk" "${package_dir}"
elif [[ "${PLATFORM}" =~ "evergreen" ]]; then
local bootloader_out_dir=
if [ -n "${BOOTLOADER:-}" ]; then
Expand All @@ -316,8 +302,7 @@ run_package_release_pipeline () {
"${package_dir}" \
"${bootloader_out_dir:-}"
else
# Sets package directory as out directory.
package_dir="${out_dir}"
cp "${out_dir}/cobalt" "${package_dir}"
fi

# Create and upload nightly archive.
Expand Down
Loading