Skip to content

Commit bd78b86

Browse files
woody-applewoody-apple
authored
Adding merge queues (#25059)
1 parent 59a4de4 commit bd78b86

29 files changed

+109
-81
lines changed

‎.github/workflows/build.yaml

+16-16
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Builds
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021
workflow_dispatch:
2122

2223
concurrency:
@@ -27,7 +28,6 @@ env:
2728
CHIP_NO_LOG_TIMESTAMPS: true
2829

2930
jobs:
30-
3131
build_linux_gcc_debug:
3232
name: Build on Linux (gcc_debug)
3333
timeout-minutes: 85
@@ -221,18 +221,18 @@ jobs:
221221
env:
222222
LSAN_OPTIONS: detect_leaks=1
223223
run: |
224-
for BUILD_TYPE in asan tsan ubsan; do
225-
case $BUILD_TYPE in
226-
"asan") GN_ARGS='is_clang=true is_asan=true';;
227-
"msan") GN_ARGS='is_clang=true is_msan=true';;
228-
"tsan") GN_ARGS='is_clang=true is_tsan=true chip_enable_wifi=false';;
229-
"ubsan") GN_ARGS='is_clang=true is_ubsan=true';;
230-
esac
231-
232-
rm -rf ./out/sanitizers
233-
BUILD_TYPE=sanitizers scripts/build/gn_gen.sh --args="$GN_ARGS" --export-compile-commands
234-
BUILD_TYPE=sanitizers scripts/tests/gn_tests.sh
235-
done
224+
for BUILD_TYPE in asan tsan ubsan; do
225+
case $BUILD_TYPE in
226+
"asan") GN_ARGS='is_clang=true is_asan=true';;
227+
"msan") GN_ARGS='is_clang=true is_msan=true';;
228+
"tsan") GN_ARGS='is_clang=true is_tsan=true chip_enable_wifi=false';;
229+
"ubsan") GN_ARGS='is_clang=true is_ubsan=true';;
230+
esac
231+
232+
rm -rf ./out/sanitizers
233+
BUILD_TYPE=sanitizers scripts/build/gn_gen.sh --args="$GN_ARGS" --export-compile-commands
234+
BUILD_TYPE=sanitizers scripts/tests/gn_tests.sh
235+
done
236236
- name: Ensure codegen is done for sanitize
237237
timeout-minutes: 45
238238
run: |
@@ -370,9 +370,9 @@ jobs:
370370
- name: Run Python Setup Payload Generator Test
371371
timeout-minutes: 10
372372
run: |
373-
scripts/run_in_build_env.sh 'scripts/examples/gn_build_example.sh examples/chip-tool out/'
374-
scripts/run_in_build_env.sh 'pip3 install -r src/setup_payload/python/requirements.txt'
375-
scripts/run_in_build_env.sh 'python3 src/setup_payload/tests/run_python_setup_payload_gen_test.py out/chip-tool'
373+
scripts/run_in_build_env.sh 'scripts/examples/gn_build_example.sh examples/chip-tool out/'
374+
scripts/run_in_build_env.sh 'pip3 install -r src/setup_payload/python/requirements.txt'
375+
scripts/run_in_build_env.sh 'python3 src/setup_payload/tests/run_python_setup_payload_gen_test.py out/chip-tool'
376376
377377
build_darwin:
378378
name: Build on Darwin (clang, python_lib, simulated)

‎.github/workflows/chef.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Build Chef CI examples on all platforms
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021

2122
concurrency:
2223
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
@@ -126,4 +127,4 @@ jobs:
126127
- name: CI Examples NRFConnect
127128
shell: bash
128129
run: |
129-
./scripts/run_in_build_env.sh "./examples/chef/chef.py --ci -t nrfconnect"
130+
./scripts/run_in_build_env.sh "./examples/chef/chef.py --ci -t nrfconnect"

‎.github/workflows/cirque.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Cirque
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021
workflow_dispatch:
2122

2223
concurrency:

‎.github/workflows/darwin-tests.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Darwin Tests
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021
workflow_dispatch:
2122

2223
concurrency:

‎.github/workflows/darwin.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Darwin
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021
workflow_dispatch:
2122

2223
concurrency:

‎.github/workflows/examples-ameba.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Build example - Ameba
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021

2122
concurrency:
2223
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

‎.github/workflows/examples-bouffalolab.yaml

+5-4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Build example - BouffaloLab
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021
workflow_dispatch:
2122

2223
concurrency:
@@ -59,10 +60,10 @@ jobs:
5960
- name: Bootstrap cache
6061
uses: actions/cache@v3
6162
with:
62-
key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
63-
path: |
64-
.environment
65-
build_overrides/pigweed_environment.gni
63+
key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
64+
path: |
65+
.environment
66+
build_overrides/pigweed_environment.gni
6667
- name: Bootstrap
6768
timeout-minutes: 25
6869
run: scripts/build/gn_bootstrap.sh

‎.github/workflows/examples-cc13x2x7_26x2x7.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Build example - TI CC26X2X7
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021

2122
concurrency:
2223
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

‎.github/workflows/examples-cc32xx.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Build example - TI CC32XX
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021

2122
concurrency:
2223
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

‎.github/workflows/examples-efr32.yaml

+5-4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Build example - EFR32
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021

2122
concurrency:
2223
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
@@ -65,10 +66,10 @@ jobs:
6566
- name: Bootstrap cache
6667
uses: actions/cache@v3
6768
with:
68-
key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
69-
path: |
70-
.environment
71-
build_overrides/pigweed_environment.gni
69+
key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
70+
path: |
71+
.environment
72+
build_overrides/pigweed_environment.gni
7273
- name: Bootstrap
7374
timeout-minutes: 25
7475
run: scripts/build/gn_bootstrap.sh

‎.github/workflows/examples-esp32.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Build example - ESP32
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021

2122
concurrency:
2223
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

‎.github/workflows/examples-infineon.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Build example - Infineon
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021
workflow_dispatch:
2122

2223
concurrency:

‎.github/workflows/examples-k32w.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Build example - K32W with SE051
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021

2122
concurrency:
2223
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

‎.github/workflows/examples-linux-arm.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Build example - Linux ARM
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021

2122
concurrency:
2223
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

‎.github/workflows/examples-linux-imx.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Build example - i.MX Linux
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021

2122
concurrency:
2223
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

‎.github/workflows/examples-linux-standalone.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Build example - Linux Standalone
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021

2122
concurrency:
2223
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

‎.github/workflows/examples-mbed.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Build example - Mbed OS
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021
workflow_dispatch:
2122

2223
concurrency:

‎.github/workflows/examples-mw320.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Build example - MW320
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021

2122
concurrency:
2223
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

‎.github/workflows/examples-nrfconnect.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Build example - nRF Connect SDK
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021

2122
concurrency:
2223
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

‎.github/workflows/examples-openiotsdk.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Build example - Open IoT SDK
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021
workflow_dispatch:
2122

2223
concurrency:

‎.github/workflows/examples-qpg.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Build example - QPG
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021

2122
concurrency:
2223
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

‎.github/workflows/examples-telink.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Build example - Telink
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021

2122
concurrency:
2223
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

‎.github/workflows/examples-tizen.yaml

+12-11
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name: Build example - Tizen
1717
on:
1818
push:
1919
pull_request:
20+
merge_group:
2021

2122
concurrency:
2223
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
@@ -63,14 +64,14 @@ jobs:
6364

6465
- name: Build Tizen examples
6566
run: |
66-
./scripts/run_in_build_env.sh \
67-
"./scripts/build/build_examples.py \
68-
--enable-flashbundle \
69-
--target tizen-arm-all-clusters \
70-
--target tizen-arm-all-clusters-minimal-no-wifi \
71-
--target tizen-arm-chip-tool-ubsan \
72-
--target tizen-arm-light \
73-
--target tizen-arm-light-no-ble-no-wifi \
74-
build \
75-
--copy-artifacts-to out/artifacts \
76-
"
67+
./scripts/run_in_build_env.sh \
68+
"./scripts/build/build_examples.py \
69+
--enable-flashbundle \
70+
--target tizen-arm-all-clusters \
71+
--target tizen-arm-all-clusters-minimal-no-wifi \
72+
--target tizen-arm-chip-tool-ubsan \
73+
--target tizen-arm-light \
74+
--target tizen-arm-light-no-ble-no-wifi \
75+
build \
76+
--copy-artifacts-to out/artifacts \
77+
"

0 commit comments

Comments
 (0)