Skip to content

Commit

Permalink
Don't hardcode version number in GCE build script
Browse files Browse the repository at this point in the history
The `export-gce-image` workflow broke after increasing the version of
cuttlefish-base to 0.9.29 in PR google#497 / commit
c1774ca

Sample failure:
https://github.com/google/android-cuttlefish/actions/runs/8669074135/job/23775337981
  • Loading branch information
Databean committed Apr 15, 2024
1 parent 315c731 commit d1a4a43
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions tools/buildimage/install_cf_packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,17 @@ sudo mkdir ${mount_point}
# starts and `512` bytes is the sectors size. See `sudo fdisk -l disk.raw`.
sudo mount -o loop,offset=$((262144 * 512)) ${diskraw} ${mount_point}

cp ${packages_dir}/cuttlefish-base_0.9.28_amd64.deb ${mount_point}/tmp/
cp ${packages_dir}/cuttlefish-user_0.9.29_amd64.deb ${mount_point}/tmp/
cp ${packages_dir}/cuttlefish-orchestration_0.9.29_amd64.deb ${mount_point}/tmp/
cp ${packages_dir}/cuttlefish-base_*_amd64.deb ${mount_point}/tmp/
cp ${packages_dir}/cuttlefish-user_*_amd64.deb ${mount_point}/tmp/
cp ${packages_dir}/cuttlefish-orchestration_*_amd64.deb ${mount_point}/tmp/

sudo chroot /mnt/image mkdir /run/resolvconf
sudo cp /etc/resolv.conf /mnt/image/run/resolvconf/resolv.conf

sudo chroot ${mount_point} apt update
sudo chroot ${mount_point} apt install -y /tmp/cuttlefish-base_0.9.28_amd64.deb
sudo chroot ${mount_point} apt install -y /tmp/cuttlefish-user_0.9.29_amd64.deb
sudo chroot ${mount_point} apt install -y /tmp/cuttlefish-orchestration_0.9.29_amd64.deb
sudo chroot ${mount_point} bash -c 'apt install -y /tmp/cuttlefish-base_*_amd64.deb'
sudo chroot ${mount_point} bash -c 'apt install -y /tmp/cuttlefish-user_*_amd64.deb'
sudo chroot ${mount_point} bash -c 'apt install -y /tmp/cuttlefish-orchestration_*_amd64.deb'

sudo rm -r ${mount_point}/run/resolvconf

Expand Down

0 comments on commit d1a4a43

Please sign in to comment.