Skip to content

Commit 7cb2034

Browse files
erwinpan1erwinpan1
authored
Merge branch 'master' into 0320_enable_fan_feature
2 parents be07e57 + d338455 commit 7cb2034

File tree

403 files changed

+21495
-5885
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

403 files changed

+21495
-5885
lines changed

‎.github/actions/bootstrap-cache/action.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: Bootstrap cache
2-
description: Bootstrap cache
2+
description: Bootstrap cache (deprecated)
33
runs:
44
using: "composite"
55
steps:
6-
- uses: Wandalen/wretry.action@v1.3.0
6+
- uses: Wandalen/wretry.action@v1.4.10
77
name: Bootstrap cache
88
continue-on-error: true
99
with:

‎.github/actions/bootstrap/action.yaml

+33-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,40 @@ inputs:
55
description: "Platform name"
66
required: false
77
default: none
8+
bootstrap-log-name:
9+
description: "Bootstrap log name"
10+
required: false
11+
default: bootstrap-logs-${{ github.job }}
12+
813
runs:
914
using: "composite"
1015
steps:
11-
- name: Bootstrap
16+
- uses: Wandalen/wretry.action@v1.4.10
17+
name: Bootstrap from cache
18+
id: bootstrap-cache
19+
continue-on-error: true
20+
with:
21+
action: buildjet/cache@v4
22+
attempt_limit: 3
23+
attempt_delay: 2000
24+
with: |
25+
key: ${{ runner.os }}-${{ inputs.platform }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
26+
path: |
27+
.environment
28+
build_overrides/pigweed_environment.gni
29+
30+
- name: Run bootstrap
31+
if: fromJSON(steps.bootstrap-cache.outputs.outputs).cache-hit != 'true' # retry returns all outputs in `outputs`
32+
env:
33+
PW_NO_CIPD_CACHE_DIR: Y
1234
shell: bash
13-
run: bash scripts/bootstrap.sh -p all,${{ inputs.platform }}
35+
run: source scripts/bootstrap.sh -p all,${{ inputs.platform }}
36+
37+
- name: Uploading bootstrap logs
38+
uses: actions/upload-artifact@v3
39+
if: always() && !env.ACT && fromJSON(steps.bootstrap-cache.outputs.outputs).cache-hit != 'true'
40+
with:
41+
name: ${{ inputs.bootstrap-log-name }}
42+
path: |
43+
.environment/gn_out/.ninja_log
44+
.environment/pigweed-venv/*.log

‎.github/actions/checkout-submodules-and-bootstrap/action.yaml

+2-9
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ inputs:
1111
bootstrap-log-name:
1212
description: "Bootstrap log name"
1313
required: false
14-
default: bootstrap-logs
14+
default: bootstrap-logs-${{ github.job }}
1515
runs:
1616
using: "composite"
1717
steps:
@@ -26,21 +26,14 @@ runs:
2626
with:
2727
platform: ${{ inputs.platform }}
2828
extra-parameters: ${{ inputs.extra-submodule-parameters }}
29-
- name: Bootstrap Cache
30-
uses: ./.github/actions/bootstrap-cache
3129
- name: Bootstrap
3230
uses: ./.github/actions/bootstrap
33-
env:
34-
PW_NO_CIPD_CACHE_DIR: Y
3531
with:
3632
platform: ${{ inputs.platform }}
33+
bootstrap-log-name: ${{ inputs.bootstrap-log-name }}
3734
- name: Dump disk info after checkout submodule & Bootstrap
3835
shell: bash
3936
run: scripts/dump_diskspace_info.sh
40-
- name: Upload Bootstrap Logs
41-
uses: ./.github/actions/upload-bootstrap-logs
42-
with:
43-
bootstrap-log-name: ${{ inputs.bootstrap-log-name }}
4437
- name: Work around TSAN ASLR issues
4538
if: runner.os == 'Linux' && !env.ACT
4639
shell: bash

‎.github/actions/checkout-submodules/action.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ inputs:
1111
runs:
1212
using: "composite"
1313
steps:
14-
- uses: Wandalen/wretry.action@v1.3.0
14+
- uses: Wandalen/wretry.action@v1.4.10
1515
name: Checkout submodules
1616
with:
1717
command: scripts/checkout_submodules.py --allow-changing-global-git-config --shallow --platform ${{ inputs.platform }} ${{ inputs.extra-parameters }}

‎.github/actions/perform-codeql-analysis/action.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ runs:
2727
with:
2828
sarif_file: "sarif-results/${{ inputs.language }}.sarif"
2929
- name: Upload loc as a Build Artifact
30-
uses: actions/upload-artifact@v2.2.0
30+
uses: actions/upload-artifact@v4
3131
with:
3232
name: sarif-results
3333
path: sarif-results

‎.github/actions/upload-bootstrap-logs/action.yaml

-18
This file was deleted.

‎.github/actions/upload-size-reports/action.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ runs:
99
using: "composite"
1010
steps:
1111
- name: Uploading Size Reports
12-
uses: actions/upload-artifact@v3
12+
uses: actions/upload-artifact@v4
1313
if: ${{ !env.ACT }}
1414
with:
1515
name: Size,${{ inputs.platform-name }}-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}

‎.github/workflows/bloat_check.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
runs-on: ubuntu-latest
3434

3535
container:
36-
image: ghcr.io/project-chip/chip-build:35
36+
image: ghcr.io/project-chip/chip-build:41
3737

3838
steps:
3939
- name: Checkout

‎.github/workflows/build.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
if: github.actor != 'restyled-io[bot]'
4141

4242
container:
43-
image: ghcr.io/project-chip/chip-build:35
43+
image: ghcr.io/project-chip/chip-build:41
4444
volumes:
4545
- "/:/runner-root-volume"
4646
- "/tmp/log_output:/tmp/test_logs"
@@ -136,7 +136,7 @@ jobs:
136136
if: github.actor != 'restyled-io[bot]'
137137

138138
container:
139-
image: ghcr.io/project-chip/chip-build:35
139+
image: ghcr.io/project-chip/chip-build:41
140140
volumes:
141141
- "/:/runner-root-volume"
142142
- "/tmp/log_output:/tmp/test_logs"
@@ -279,7 +279,7 @@ jobs:
279279
if: github.actor != 'restyled-io[bot]'
280280

281281
container:
282-
image: ghcr.io/project-chip/chip-build:35
282+
image: ghcr.io/project-chip/chip-build:41
283283
volumes:
284284
- "/:/runner-root-volume"
285285
- "/tmp/log_output:/tmp/test_logs"
@@ -340,7 +340,7 @@ jobs:
340340
if: github.actor != 'restyled-io[bot]'
341341

342342
container:
343-
image: ghcr.io/project-chip/chip-build:35
343+
image: ghcr.io/project-chip/chip-build:41
344344
volumes:
345345
- "/:/runner-root-volume"
346346
- "/tmp/log_output:/tmp/test_logs"
@@ -449,7 +449,7 @@ jobs:
449449
if: github.actor != 'restyled-io[bot]'
450450

451451
container:
452-
image: ghcr.io/project-chip/chip-build:35
452+
image: ghcr.io/project-chip/chip-build:41
453453
volumes:
454454
- "/:/runner-root-volume"
455455
- "/tmp/log_output:/tmp/test_logs"

‎.github/workflows/chef.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
if: github.actor != 'restyled-io[bot]'
3434

3535
container:
36-
image: ghcr.io/project-chip/chip-build:35
36+
image: ghcr.io/project-chip/chip-build:41
3737
options: --user root
3838

3939
steps:
@@ -54,7 +54,7 @@ jobs:
5454
if: github.actor != 'restyled-io[bot]'
5555

5656
container:
57-
image: ghcr.io/project-chip/chip-build-esp32:35
57+
image: ghcr.io/project-chip/chip-build-esp32:41
5858
options: --user root
5959

6060
steps:
@@ -75,7 +75,7 @@ jobs:
7575
if: github.actor != 'restyled-io[bot]'
7676

7777
container:
78-
image: ghcr.io/project-chip/chip-build-nrf-platform:35
78+
image: ghcr.io/project-chip/chip-build-nrf-platform:41
7979
options: --user root
8080

8181
steps:
@@ -96,7 +96,7 @@ jobs:
9696
if: github.actor != 'restyled-io[bot]'
9797

9898
container:
99-
image: ghcr.io/project-chip/chip-build-telink:35
99+
image: ghcr.io/project-chip/chip-build-telink:41
100100
options: --user root
101101

102102
steps:

‎.github/workflows/cirque.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
# need to run with privilege, which isn't supported by job.XXX.contaner
4141
# https://github.com/actions/container-action/issues/2
4242
# container:
43-
# image: ghcr.io/project-chip/chip-build-cirque:35
43+
# image: ghcr.io/project-chip/chip-build-cirque:41
4444
# volumes:
4545
# - "/tmp:/tmp"
4646
# - "/dev/pts:/dev/pts"
@@ -57,6 +57,7 @@ jobs:
5757
with:
5858
platform: linux
5959

60+
# TODO: Is what's being cached here actually compatible with a regular bootstrap?
6061
- name: Bootstrap Cache
6162
uses: ./.github/actions/bootstrap-cache
6263
- name: Bootstrap Cirque
@@ -71,7 +72,7 @@ jobs:
7172
- name: Get Cirque Bootstrap cache key
7273
id: cirque-bootstrap-cache-key
7374
run: echo "val=$(scripts/tests/cirque_tests.sh cachekeyhash)" >> $GITHUB_OUTPUT
74-
- uses: Wandalen/wretry.action@v1.4.5
75+
- uses: Wandalen/wretry.action@v1.4.10
7576
name: Cirque Bootstrap cache
7677
if: ${{ !env.ACT }}
7778
continue-on-error: true

0 commit comments

Comments
 (0)