From 8e604d2ab82c95beba3eeb72683bc47dc7e947b1 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Thu, 27 Mar 2025 17:46:35 -0700 Subject: [PATCH] Update cuttlefish CI --- .github/workflows/build.yml | 4 ++-- scripts/cuttlefish.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5167f588a..43896c1c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -177,8 +177,8 @@ jobs: fail-fast: false matrix: include: - - branch: "aosp-main" - device: "aosp_cf_x86_64_phone" + - branch: "aosp-android-latest-release" + device: "aosp_cf_x86_64_only_phone" steps: - name: Check out diff --git a/scripts/cuttlefish.sh b/scripts/cuttlefish.sh index 5375d3728..a4f7ce11d 100755 --- a/scripts/cuttlefish.sh +++ b/scripts/cuttlefish.sh @@ -19,7 +19,7 @@ run_cvd_bin() { } setup_env() { - curl -LO https://github.com/topjohnwu/magisk-files/releases/download/files/cuttlefish-base_0.9.30_amd64.deb + curl -LO https://github.com/topjohnwu/magisk-files/releases/download/files/cuttlefish-base_1.2.0_amd64.deb sudo dpkg -i ./cuttlefish-base_*_*64.deb || sudo apt-get install -f rm cuttlefish-base_*_*64.deb echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules @@ -37,12 +37,12 @@ download_cf() { local device=$2 if [ -z $branch ]; then - branch='aosp-main' + branch='aosp-android-latest-release' fi if [ -z $device ]; then - device='aosp_cf_x86_64_phone' + device='aosp_cf_x86_64_only_phone' fi - local target="${device}-trunk_staging-userdebug" + local target="${device}-userdebug" local build_id=$(curl -sL https://ci.android.com/builds/branches/${branch}/status.json | \ jq -r ".targets[] | select(.name == \"$target\") | .last_known_good_build")