Revert "Remove TV app from full builds and smoke tests as they have been included in CI as a build example per issue Issue 30906" (#32774)
* Revert "Remove TV app from full builds and smoke tests as they have been incl…"
This reverts commit 0aa859a67c897ff66ad7b7d6affcd2268ccf6c42.
* Delete .github/workflows/examples-tv-app.yaml
diff --git a/.github/workflows/examples-tv-app.yaml b/.github/workflows/examples-tv-app.yaml
deleted file mode 100644
index c59a929..0000000
--- a/.github/workflows/examples-tv-app.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright (c) 2023 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: Build example - TV App and TV Casting App
-
-on:
- push:
- pull_request:
- merge_group:
-
-concurrency:
- group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
- cancel-in-progress: true
-
-env:
- CHIP_NO_LOG_TIMESTAMPS: true
-
-jobs:
- tv-app:
- name: TV App
-
- env:
- BUILD_TYPE: tv_app
-
- runs-on: ubuntu-latest
- if: github.actor != 'restyled-io[bot]'
-
- container:
- image: ghcr.io/project-chip/chip-build-android:41
- volumes:
- - "/tmp/bloat_reports:/tmp/bloat_reports"
-
- steps:
- - name: Checkout
- uses: actions/checkout@v4
- - name: Checkout submodules & Bootstrap
- uses: ./.github/actions/checkout-submodules-and-bootstrap
- with:
- platform: android
- - name: Set up environment for size reports
- uses: ./.github/actions/setup-size-reports
- if: ${{ !env.ACT }}
- with:
- gh-context: ${{ toJson(github) }}
- - name: Build Android arm64-tv-casting-app
- run: |
- ./scripts/run_in_build_env.sh \
- "./scripts/build/build_examples.py --target android-arm64-tv-casting-app build"
- - name: Clean out build output
- run: rm -rf ./out examples/tv-casting-app/android/App/app/libs/jniLibs/* examples/tv-casting-app/android/App/app/libs/*.jar
- - name: Build Android arm64-tv-server
- run: |
- ./scripts/run_in_build_env.sh \
- "./scripts/build/build_examples.py --target android-arm64-tv-server build"
- - name: Clean out build output
- run: rm -rf ./out examples/tv-app/android/App/app/libs/jniLibs/* examples/tv-app/android/App/app/libs/*.jar
- - name: Uploading Size Reports
- uses: ./.github/actions/upload-size-reports
- if: ${{ !env.ACT }}
- with:
- platform-name: TVApp
diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml
index 78b2f0f..81a277d 100644
--- a/.github/workflows/full-android.yaml
+++ b/.github/workflows/full-android.yaml
@@ -73,6 +73,30 @@
"./scripts/build/build_examples.py --target android-arm-chip-tool build"
- name: Clean out build output
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/* examples/android/CHIPTool/app/libs/*.jar
+ - name: Build Android arm-tv-casting-app
+ run: |
+ ./scripts/run_in_build_env.sh \
+ "./scripts/build/build_examples.py --target android-arm-tv-casting-app build"
+ - name: Clean out build output
+ run: rm -rf ./out examples/tv-casting-app/android/App/app/libs/jniLibs/* examples/tv-casting-app/android/App/app/libs/*.jar
+ - name: Build Android arm-tv-server
+ run: |
+ ./scripts/run_in_build_env.sh \
+ "./scripts/build/build_examples.py --target android-arm-tv-server build"
+ - name: Clean out build output
+ run: rm -rf ./out examples/tv-app/android/App/app/libs/jniLibs/* examples/tv-app/android/App/app/libs/*.jar
+ - name: Build Android arm64-tv-casting-app
+ run: |
+ ./scripts/run_in_build_env.sh \
+ "./scripts/build/build_examples.py --target android-arm64-tv-casting-app build"
+ - name: Clean out build output
+ run: rm -rf ./out examples/tv-casting-app/android/app/libs/jniLibs/* examples/android/CHIPTool/app/libs/*.jar
+ - name: Build Android arm64-tv-server
+ run: |
+ ./scripts/run_in_build_env.sh \
+ "./scripts/build/build_examples.py --target android-arm64-tv-server build"
+ - name: Clean out build output
+ run: rm -rf ./out examples/tv-app/android/App/app/libs/jniLibs/* examples/tv-app/android/App/app/libs/*.jar
- name: Build Android arm64-chip-tool
run: |
./scripts/run_in_build_env.sh \
diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml
index 5ebd5e5..d1dd509 100644
--- a/.github/workflows/smoketest-android.yaml
+++ b/.github/workflows/smoketest-android.yaml
@@ -68,3 +68,15 @@
"ninja -C out/android-arm64-chip-tool build/chip/java/tests:java_build_test"
- name: Clean out build output
run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/* examples/android/CHIPTool/app/libs/*.jar
+ - name: Build Android arm64-tv-casting-app
+ run: |
+ ./scripts/run_in_build_env.sh \
+ "./scripts/build/build_examples.py --target android-arm64-tv-casting-app build"
+ - name: Clean out build output
+ run: rm -rf ./out examples/tv-casting-app/android/App/app/libs/jniLibs/* examples/tv-casting-app/android/App/app/libs/*.jar
+ - name: Build Android arm64-tv-server
+ run: |
+ ./scripts/run_in_build_env.sh \
+ "./scripts/build/build_examples.py --target android-arm64-tv-server build"
+ - name: Clean out build output
+ run: rm -rf ./out examples/tv-app/android/App/app/libs/jniLibs/* examples/tv-app/android/App/app/libs/*.jar