Skip to content

Commit de3a253

Browse files
committed
Merge branch 'master' into feature/da_verifier_revocation_check_2
2 parents f638fe2 + 5570be9 commit de3a253

File tree

2,756 files changed

+112490
-80462
lines changed

Some content is hidden

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

2,756 files changed

+112490
-80462
lines changed

.clang-format

+1
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ SpacesInSquareBrackets: false
106106
Standard: Cpp11
107107
TabWidth: 8
108108
UseTab: Never
109+
InsertNewlineAtEOF: true
109110
---
110111
Language: ObjC
111112
BasedOnStyle: WebKit

.flake8

-6
This file was deleted.

.github/.wordlist.txt

+14
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@ DelayedActionTime
369369
delayedApplyActionTimeSec
370370
delayedQueryActionTimeSec
371371
delayQuery
372+
deliverables
372373
demangle
373374
deployable
374375
depottools
@@ -585,6 +586,8 @@ GenericWiFiConfigurationManagerImpl
585586
GetDeviceId
586587
GetDeviceInfo
587588
GetDns
589+
getter
590+
getters
588591
GetInDevelopmentTests
589592
GetIP
590593
getManualTests
@@ -643,6 +646,8 @@ HomePods
643646
hostapd
644647
hostname
645648
href
649+
HSM
650+
hsm
646651
HTTPS
647652
HW
648653
hwadr
@@ -668,6 +673,7 @@ ifdef
668673
ifdefs
669674
IGMP
670675
ihex
676+
Illuminance
671677
IlluminanceMeasurement
672678
IM
673679
imager
@@ -724,6 +730,7 @@ JLink
724730
JLinkExe
725731
JLinkRTTClient
726732
JN
733+
jni
727734
jpg
728735
jre
729736
js
@@ -898,12 +905,14 @@ MoveWithOnOff
898905
MPSL
899906
MRP
900907
MTD
908+
MTR
901909
MTU
902910
Multiband
903911
Multicast
904912
multilib
905913
Multiprotocol
906914
multithreaded
915+
mutex
907916
mutexes
908917
mv
909918
MX
@@ -933,6 +942,7 @@ nfds
933942
NitricOxideConcentrationMeasurement
934943
NitrogenDioxideConcentrationMeasurement
935944
nl
945+
nltest
936946
NLUnitTest
937947
NLUnitTests
938948
nmcli
@@ -964,6 +974,7 @@ objcopy
964974
OccupancySensing
965975
OctetString
966976
OECORE
977+
OID
967978
ol
968979
Onboarding
969980
onboardingcodes
@@ -985,6 +996,7 @@ openweave
985996
OperationalCredentials
986997
operationalDataset
987998
opkg
999+
OPTIGA
9881000
optionMask
9891001
optionOverride
9901002
optionsMask
@@ -1428,6 +1440,7 @@ transitionTime
14281440
TransportMgrBase
14291441
TriggerEffect
14301442
TRNG
1443+
trustm
14311444
TrustedRootCertificates
14321445
tsan
14331446
TSG
@@ -1493,6 +1506,7 @@ utils
14931506
UUID
14941507
ux
14951508
validator
1509+
valgrind
14961510
vcom
14971511
VCP
14981512
Vectorcall

.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

+66-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,73 @@ 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+
outputs:
13+
cache-hit:
14+
description: "Bootstrap environment was restored from cache"
15+
value: ${{ fromJSON(steps.restore.outputs.outputs).cache-hit }} # dynamic action returns all outputs in `outputs`
16+
817
runs:
918
using: "composite"
1019
steps:
11-
- name: Bootstrap
20+
- name: Determine bootstrap cache configuration
21+
id: prepare
22+
shell: bash
23+
run: |
24+
# Determine bootstrap cache configuration
25+
# In addition to the various setup files, the work directory matters as well,
26+
# because the bootstrapped Pigweed environment contains absolute paths.
27+
echo "Calculating bootstrap cache key for '$PWD'"
28+
FILES_HASH="${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}"
29+
FINAL_HASH="$(echo "$PWD:$FILES_HASH" | shasum -a 256 | cut -d' ' -f1)"
30+
echo key="${RUNNER_OS}-${RUNNER_ARCH}-${{ inputs.platform }}-${FINAL_HASH}" | tee -a "$GITHUB_OUTPUT"
31+
32+
# Split caches across backends
33+
case "$RUNNER_OS" in
34+
macOS) echo backend=actions;;
35+
*) echo backend=buildjet;;
36+
esac | tee -a "$GITHUB_OUTPUT"
37+
38+
- name: Bootstrap from cache
39+
id: restore
40+
uses: ./.github/actions/dynamic
41+
continue-on-error: true
42+
with:
43+
action: ${{ steps.prepare.outputs.backend }}/cache/restore@v4
44+
with: |
45+
key: ${{ steps.prepare.outputs.key }}
46+
path: |
47+
.environment
48+
build_overrides/pigweed_environment.gni
49+
50+
- name: Run bootstrap
51+
if: ${{ fromJSON(steps.restore.outputs.outputs).cache-hit != 'true' }}
52+
env:
53+
PW_NO_CIPD_CACHE_DIR: 1
54+
PW_ENVSETUP_NO_BANNER: 1
1255
shell: bash
13-
run: bash scripts/bootstrap.sh -p all,${{ inputs.platform }}
56+
run: source scripts/bootstrap.sh -p all,${{ inputs.platform }}
57+
58+
- name: Save bootstrap cache
59+
uses: ./.github/actions/dynamic
60+
if: ${{ fromJSON(steps.restore.outputs.outputs).cache-hit != 'true' }}
61+
continue-on-error: true
62+
with:
63+
action: ${{ steps.prepare.outputs.backend }}/cache/save@v4
64+
with: |
65+
key: ${{ steps.prepare.outputs.key }}
66+
path: |
67+
.environment
68+
build_overrides/pigweed_environment.gni
69+
70+
- name: Upload bootstrap logs
71+
uses: actions/upload-artifact@v4
72+
if: ${{ always() && !env.ACT && fromJSON(steps.restore.outputs.outputs).cache-hit != 'true' }}
73+
with:
74+
name: ${{ inputs.bootstrap-log-name }}
75+
path: |
76+
.environment/gn_out/.ninja_log
77+
.environment/pigweed-venv/*.log

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

+9-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,18 +26,18 @@ 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 }}
37+
- name: Work around TSAN ASLR issues
38+
if: runner.os == 'Linux' && !env.ACT
39+
shell: bash
40+
run: |
41+
# See https://stackoverflow.com/a/77856955/2365113
42+
if [[ "$UID" == 0 ]]; then function sudo() { "$@"; }; fi
43+
sudo sysctl vm.mmap_rnd_bits=28

.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/dynamic/action.yaml

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Dynamic
2+
description: Dynamically resolves another GitHub action
3+
inputs:
4+
action:
5+
description: Action reference
6+
required: true
7+
with:
8+
description: Action inputs as multi-line YAML string
9+
required: false
10+
default: ""
11+
outputs:
12+
outputs:
13+
description: JSON object of outputs from the action
14+
value: ${{ steps.run.outputs.outputs }}
15+
runs:
16+
using: composite
17+
steps:
18+
- name: Instantiate
19+
shell: bash
20+
run: |
21+
# Dynamically invoke ${{ inputs.action }}
22+
with='${{ inputs.with }}'
23+
[[ -z "$with" ]] || with="$(echo ' with:'; sed -e 's/^/ /' <<<"$with")"
24+
mkdir -p ./.tmp/dynamic-action-instance
25+
cat <<END >./.tmp/dynamic-action-instance/action.yaml
26+
runs:
27+
using: composite
28+
steps:
29+
- id: run
30+
uses: ${{ inputs.action }}
31+
$with
32+
outputs:
33+
outputs:
34+
value: $(echo '$'){{ toJSON(steps.run.outputs) }}
35+
END
36+
- name: Run
37+
id: run
38+
uses: ./.tmp/dynamic-action-instance

.github/actions/maximize-runner-disk/action.yaml

+35-37
Original file line numberDiff line numberDiff line change
@@ -4,47 +4,45 @@ runs:
44
using: "composite"
55
steps:
66
- name: Free up disk space on the github runner
7-
if: ${{ !env.ACT }}
7+
if: runner.os == 'Linux' && !env.ACT
88
shell: bash
99
run: |
1010
# maximize-runner-disk
11-
if [[ "$RUNNER_OS" == Linux ]]; then
12-
# Directories to prune to free up space. Candidates:
13-
# 1.6G /usr/share/dotnet
14-
# 1.1G /usr/local/lib/android/sdk/platforms
15-
# 1000M /usr/local/lib/android/sdk/build-tools
16-
# 8.9G /usr/local/lib/android/sdk
17-
# This list can be amended later to change the trade-off between the amount of
18-
# disk space freed up, and how long it takes to do so (deleting many files is slow).
19-
prune=(/usr/share/dotnet /usr/local/lib/android/sdk/platforms /usr/local/lib/android/sdk/build-tools)
11+
# Directories to prune to free up space. Candidates:
12+
# 1.6G /usr/share/dotnet
13+
# 1.1G /usr/local/lib/android/sdk/platforms
14+
# 1000M /usr/local/lib/android/sdk/build-tools
15+
# 8.9G /usr/local/lib/android/sdk
16+
# This list can be amended later to change the trade-off between the amount of
17+
# disk space freed up, and how long it takes to do so (deleting many files is slow).
18+
prune=(/usr/share/dotnet /usr/local/lib/android/sdk/platforms /usr/local/lib/android/sdk/build-tools)
2019
21-
if [[ "$UID" -eq 0 && -d /__w ]]; then
22-
root=/runner-root-volume
23-
if [[ ! -d "$root" ]]; then
24-
echo "Unable to maximize disk space, job is running inside a container and $root is not mounted"
25-
exit 0
26-
fi
27-
function sudo() { "$@"; } # we're already root (and sudo is probably unavailable)
28-
elif [[ "$UID" -ne 0 && "$RUNNER_ENVIRONMENT" == github-hosted ]]; then
29-
root=
30-
else
31-
echo "Unable to maximize disk space, unknown runner environment"
20+
if [[ "$UID" -eq 0 && -d /__w ]]; then
21+
root=/runner-root-volume
22+
if [[ ! -d "$root" ]]; then
23+
echo "Unable to maximize disk space, job is running inside a container and $root is not mounted"
3224
exit 0
3325
fi
34-
35-
echo "Freeing up runner disk space on ${root:-/}"
36-
function avail() { df -k --output=avail "${root:-/}" | grep '^[0-9]*$'; }
37-
function now() { date '+%s'; }
38-
before="$(avail)" start="$(now)"
39-
for dir in "${prune[@]}"; do
40-
if [[ -d "${root}${dir}" ]]; then
41-
echo "- $dir"
42-
# du -sh -- "${root}${dir}"
43-
sudo rm -rf -- "${root}${dir}"
44-
else
45-
echo "- $dir (not found)"
46-
fi
47-
done
48-
after="$(avail)" end="$(now)"
49-
echo "Done, freed up $(( (after - before) / 1024 ))M of disk space in $(( end - start )) seconds."
26+
function sudo() { "$@"; } # we're already root (and sudo is probably unavailable)
27+
elif [[ "$UID" -ne 0 && "$RUNNER_ENVIRONMENT" == github-hosted ]]; then
28+
root=
29+
else
30+
echo "Unable to maximize disk space, unknown runner environment"
31+
exit 0
5032
fi
33+
34+
echo "Freeing up runner disk space on ${root:-/}"
35+
function avail() { df -k --output=avail "${root:-/}" | grep '^[0-9]*$'; }
36+
function now() { date '+%s'; }
37+
before="$(avail)" start="$(now)"
38+
for dir in "${prune[@]}"; do
39+
if [[ -d "${root}${dir}" ]]; then
40+
echo "- $dir"
41+
# du -sh -- "${root}${dir}"
42+
sudo rm -rf -- "${root}${dir}"
43+
else
44+
echo "- $dir (not found)"
45+
fi
46+
done
47+
after="$(avail)" end="$(now)"
48+
echo "Done, freed up $(( (after - before) / 1024 ))M of disk space in $(( end - start )) seconds."

.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.

0 commit comments

Comments
 (0)