Skip to content

Commit

Permalink
Merge branch 'main' into aosp-branch-target-arm
Browse files Browse the repository at this point in the history
  • Loading branch information
rmuthiah authored Feb 16, 2024
2 parents 0bbd66b + 10dee95 commit e779284
Show file tree
Hide file tree
Showing 510 changed files with 60,393 additions and 1,854 deletions.
52 changes: 52 additions & 0 deletions .github/workflows/artifacts.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Artifacts
on:
pull_request:
paths:
- '.github/workflows/artifacts.yaml'
- 'tools/buildimage/**'
push:
branches:
- main
jobs:
export-debs:
runs-on: ubuntu-22.04
container:
image: debian@sha256:4cb3f4198e4af2d03dffe6bfa4f3686773596494ef298f3882553d52e885634b # debian:bullseye-20240110
steps:
- name: apt update
run: apt update -y && apt upgrade -y
- name: install sudo
run: apt install -y sudo
- name: Checkout repository
uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 # aka v2
- name: Build debs
run: bash build_debs.sh
- name: Build debs.tar
run: find . -name 'cuttlefish-*.deb' -print0 | tar -cvf debs.tar --null --files-from -
- name: Publish debs.tar
uses: actions/upload-artifact@v3
with:
name: debs
path: debs.tar
export-gce-image:
needs: export-debs
runs-on: ubuntu-22.04
steps:
- name: Free space
run: rm -rf /opt/hostedtoolcache
- name: Checkout repository
uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 # aka v2
- name: Download debs.tar
uses: actions/download-artifact@v3
with:
name: debs
- name: Untar debs.tar
run: tar -xf debs.tar
- name: Build image
run: bash tools/buildimage/main.sh
- name: Publish image
uses: actions/upload-artifact@v3
with:
name: image_gce_debian11_amd64
path: image.tar.gz

21 changes: 20 additions & 1 deletion .github/workflows/presubmit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Vet Test Build
run: cd frontend/src/host_orchestrator && go vet ./... && go test ./... && go build ./...
build-debian-package:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: ${{ always() && needs.build-orchestrator.result == 'success' }}
needs: [build-orchestrator]
container:
Expand All @@ -35,6 +35,8 @@ jobs:
uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 # aka v2
with:
path: "android-cuttlefish"
- name: install package build dependencies
run: cd android-cuttlefish/base && mk-build-deps -i -t 'apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y'
- name: build base debian package
run: cd android-cuttlefish/base && debuild -i -us -uc -b
- name: install base debian package
Expand All @@ -43,3 +45,20 @@ jobs:
run: cd android-cuttlefish/frontend && debuild -i -us -uc -b
- name: install user debian package
run: dpkg -i android-cuttlefish/cuttlefish-user_*_*64.deb || apt-get install -f -y
build-cvd:
runs-on: ubuntu-latest
container:
image: debian@sha256:3b6053ca925336c804e2d3f080af177efcdc9f51198a627569bfc7c7e730ef7e
steps:
- name: Checkout repository
uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 # aka v2
- name: Setup apt
run: apt update -y && apt upgrade -y
- name: Install dependencies
run: apt install -y clang pkg-config meson libfmt-dev libgflags-dev libjsoncpp-dev protobuf-compiler libgtest-dev libcurl4-openssl-dev libprotobuf-c-dev libgoogle-glog-dev libssl-dev libxml2-dev openssl uuid-dev
- name: Setup meson
run: mkdir base/cvd/build && cd base/cvd/build && meson setup
- name: Build cvd
run: cd base/cvd/build && meson compile
- name: Test cvd
run: cd base/cvd/build && meson test -v
1 change: 1 addition & 0 deletions .kokoro/continuous.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build_file: "android-cuttlefish/.kokoro/public_test.sh"
1 change: 1 addition & 0 deletions .kokoro/presubmit.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build_file: "android-cuttlefish/.kokoro/public_test.sh"
6 changes: 6 additions & 0 deletions .kokoro/public_test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash

# Fail on errors
set -e

echo "Cuttlefish debian package build and testing placeholder script for kokoro"
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ The packages can be built with the following command:
```bash
for dir in base frontend; do
pushd $dir
# Install build dependencies
sudo mk-build-deps -i
dpkg-buildpackage -uc -us
popd
done
Expand Down
35 changes: 0 additions & 35 deletions allocd-port/CMakeLists.txt

This file was deleted.

49 changes: 0 additions & 49 deletions allocd-port/README.md

This file was deleted.

4 changes: 0 additions & 4 deletions allocd-port/bin/.gitignore

This file was deleted.

4 changes: 0 additions & 4 deletions allocd-port/build/.gitignore

This file was deleted.

Loading

0 comments on commit e779284

Please sign in to comment.