Update cuttlefish CI

This commit is contained in:
topjohnwu 2025-03-27 17:46:35 -07:00 committed by John Wu
parent 2aba7247a9
commit 8e604d2ab8
2 changed files with 6 additions and 6 deletions

View File

@ -177,8 +177,8 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
- branch: "aosp-main" - branch: "aosp-android-latest-release"
device: "aosp_cf_x86_64_phone" device: "aosp_cf_x86_64_only_phone"
steps: steps:
- name: Check out - name: Check out

View File

@ -19,7 +19,7 @@ run_cvd_bin() {
} }
setup_env() { 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 sudo dpkg -i ./cuttlefish-base_*_*64.deb || sudo apt-get install -f
rm cuttlefish-base_*_*64.deb 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 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 local device=$2
if [ -z $branch ]; then if [ -z $branch ]; then
branch='aosp-main' branch='aosp-android-latest-release'
fi fi
if [ -z $device ]; then if [ -z $device ]; then
device='aosp_cf_x86_64_phone' device='aosp_cf_x86_64_only_phone'
fi 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 | \ local build_id=$(curl -sL https://ci.android.com/builds/branches/${branch}/status.json | \
jq -r ".targets[] | select(.name == \"$target\") | .last_known_good_build") jq -r ".targets[] | select(.name == \"$target\") | .last_known_good_build")