From 534b6d9b653652a79b17c4f9fad8987702ec92ed Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Wed, 21 Jun 2023 02:32:54 -0400 Subject: [PATCH] Removing dead stuff, and collapasing darwin (#27360) --- .github/workflows/darwin.yaml | 5 ++ .github/workflows/fixit_rotation.yaml | 36 ----------- .github/workflows/smoketest-darwin.yaml | 81 ------------------------- scripts/fixit_rotation.py | 41 ------------- 4 files changed, 5 insertions(+), 158 deletions(-) delete mode 100644 .github/workflows/fixit_rotation.yaml delete mode 100644 .github/workflows/smoketest-darwin.yaml delete mode 100755 scripts/fixit_rotation.py diff --git a/.github/workflows/darwin.yaml b/.github/workflows/darwin.yaml index feffe54443535d..0d47fd3f166941 100644 --- a/.github/workflows/darwin.yaml +++ b/.github/workflows/darwin.yaml @@ -166,6 +166,11 @@ jobs: # but to instrument the code in the underlying libCHIP we need to pass CHIP_IS_TSAN=YES xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableThreadSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion -Wno-incomplete-umbrella -Wno-unguarded-availability-new' CHIP_IS_TSAN=YES > >(tee /tmp/darwin/framework-tests/darwin-tests-tsan.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-tsan-err.log >&2) working-directory: src/darwin/Framework + - name: Build Matter TV Casting Bridge + timeout-minutes: 20 + run: | + xcodebuild -target "MatterTvCastingBridge" -sdk iphoneos + working-directory: examples/tv-casting-app/darwin/MatterTvCastingBridge - name: Uploading log files uses: actions/upload-artifact@v3 if: ${{ failure() && !env.ACT }} diff --git a/.github/workflows/fixit_rotation.yaml b/.github/workflows/fixit_rotation.yaml deleted file mode 100644 index dbf61582962a9d..00000000000000 --- a/.github/workflows/fixit_rotation.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (c) 2021 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: Pick Fixit Rotation - -on: - workflow_dispatch: - -jobs: - shuffle_names: - name: Shuffle names - runs-on: ubuntu-latest - - steps: - - uses: Wandalen/wretry.action@v1.0.41 - name: Checkout - with: - action: actions/checkout@v3.5.2 - with: | - submodules: true - token: ${{ github.token }} - attempt_limit: 3 - attempt_delay: 2000 - - name: Pick fixit rotation order - run: scripts/fixit_rotation.py diff --git a/.github/workflows/smoketest-darwin.yaml b/.github/workflows/smoketest-darwin.yaml deleted file mode 100644 index 069d68b08b047c..00000000000000 --- a/.github/workflows/smoketest-darwin.yaml +++ /dev/null @@ -1,81 +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: Smoke Test - Darwin - -on: - push: - pull_request: - merge_group: - workflow_dispatch: - -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 - # XXX: Workaround for https://github.com/actions/cache/issues/1141 - SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 - -jobs: - darwin: - name: Smoke Run - Darwin - timeout-minutes: 60 - - if: github.actor != 'restyled-io[bot]' - runs-on: macos-latest - - steps: - - uses: Wandalen/wretry.action@v1.0.41 - name: Checkout - with: - action: actions/checkout@v3.5.2 - with: | - token: ${{ github.token }} - attempt_limit: 3 - attempt_delay: 2000 - - name: Checkout submodules - run: scripts/checkout_submodules.py --allow-changing-global-git-config --shallow --platform darwin - - name: Setup Environment - run: brew install python@3.9 - - - uses: Wandalen/wretry.action@v1.0.41 - name: Bootstrap cache - timeout-minutes: 20 - with: - action: buildjet/cache@v3 - attempt_limit: 3 - attempt_delay: 2000 - with: | - key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }} - path: | - .environment - build_overrides/pigweed_environment.gni - - name: Bootstrap - timeout-minutes: 25 - run: bash scripts/bootstrap.sh - - name: Uploading bootstrap logs - uses: actions/upload-artifact@v3 - if: ${{ always() && !env.ACT }} - with: - name: bootstrap-logs - path: | - .environment/gn_out/.ninja_log - .environment/pigweed-venv/*.log - - name: Build Matter TV Casting Bridge - timeout-minutes: 45 - run: | - xcodebuild -target "MatterTvCastingBridge" -sdk iphoneos - working-directory: examples/tv-casting-app/darwin/MatterTvCastingBridge diff --git a/scripts/fixit_rotation.py b/scripts/fixit_rotation.py deleted file mode 100755 index ed47ce3479693e..00000000000000 --- a/scripts/fixit_rotation.py +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env python -import random - -ROTATION_CHOICES = [ - 'Andrei (Google)', - 'Boris (Apple)', - 'Cecille (Google)', - 'Damian (Nordic)', - 'Etienne (Silabs)', - 'Junior (Silabs)', - 'Kamil (Nordic)', - 'Kevin (Google)', - # 'Martin (Google)', # TO be enabled July 2021 - 'Michael (Google)', - 'Mingjie (Google)', - 'Pankaj (Apple)', - 'Ricardo (Silabs)', - 'Rob (Google)', - 'Song (Google)', - 'Timothy (Qorvo)', - 'Victor (Samsung)', - 'Vivien (Apple)', - 'Yufeng (Google)', - 'Yunhan (Google)', -] - - -def main(): - """Main task if executed standalone.""" - print("Rolling dice....") - - results = ROTATION_CHOICES[:] - random.shuffle(results) - - print("Results: ") - for idx, name in enumerate(results): - print(" %2d: %s" % (idx + 1, name)) - - -if __name__ == "__main__": - main()