Skip to content

Commit ed212e7

Browse files
yangsong-cnynyangsong-cnyn
authored
Merge branch 'main' into pd_infra
2 parents 2d4bea4 + 8188d9e commit ed212e7

File tree

31 files changed

+356
-50
lines changed

31 files changed

+356
-50
lines changed

‎.github/workflows/border_router.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ jobs:
150150
MAX_JOBS: 3
151151
VERBOSE: 1
152152
steps:
153-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
153+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
154154
with:
155155
submodules: recursive
156156
- name: Get Border Router Test ID
@@ -159,7 +159,7 @@ jobs:
159159
echo "id=${GITHUB_WORKFLOW}-${GITHUB_JOB}-${GITHUB_RUN_ID}-${{matrix.name}}" >> $GITHUB_OUTPUT
160160
- name: Check cached result
161161
id: check_cache_result
162-
uses: actions/cache@v4
162+
uses: actions/cache@v5
163163
with:
164164
path: |
165165
_test_complete_

‎.github/workflows/build.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
pretty:
4646
runs-on: ubuntu-24.04
4747
steps:
48-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
48+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4949
- name: Bootstrap
5050
run: BUILD_TARGET=pretty-check tests/scripts/bootstrap.sh
5151
- name: Check
@@ -65,7 +65,7 @@ jobs:
6565
OTBR_OPTIONS: "-DOTBR_DHCP6_PD=ON -DOTBR_SRP_SERVER_ON_INIT=ON"
6666
OTBR_COVERAGE: 1
6767
steps:
68-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
68+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
6969
with:
7070
submodules: recursive
7171
- name: Bootstrap
@@ -88,7 +88,7 @@ jobs:
8888
OTBR_OPTIONS: "-DOTBR_SRP_SERVER_ON_INIT=ON"
8989
OTBR_COVERAGE: 1
9090
steps:
91-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
91+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
9292
with:
9393
submodules: recursive
9494
- name: Bootstrap
@@ -104,7 +104,7 @@ jobs:
104104
BUILD_TARGET: script-check
105105
OTBR_COVERAGE: 1
106106
steps:
107-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
107+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
108108
with:
109109
submodules: recursive
110110
- name: Bootstrap
@@ -121,7 +121,7 @@ jobs:
121121
CC: clang
122122
CXX: clang++
123123
steps:
124-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
124+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
125125
with:
126126
submodules: recursive
127127
- name: Bootstrap
@@ -134,7 +134,7 @@ jobs:
134134
env:
135135
BUILD_TARGET: package
136136
steps:
137-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
137+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
138138
with:
139139
submodules: recursive
140140
- name: Bootstrap
@@ -149,7 +149,7 @@ jobs:
149149
env:
150150
BUILD_TARGET: check
151151
steps:
152-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
152+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
153153
with:
154154
submodules: recursive
155155
- name: Bootstrap

‎.github/workflows/docker-border-router.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ jobs:
6363

6464
steps:
6565
- name: Harden Runner
66-
uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
66+
uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
6767
with:
6868
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
6969

70-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4.2.2
70+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4.2.2
7171
with:
7272
submodules: recursive
7373

@@ -130,7 +130,7 @@ jobs:
130130
- build
131131
steps:
132132
- name: Harden Runner
133-
uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
133+
uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
134134
with:
135135
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
136136

‎.github/workflows/docker.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
OTBR_COVERAGE: 1
4949
VERBOSE: 1
5050
steps:
51-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
51+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5252
with:
5353
submodules: recursive
5454
- name: Bootstrap
@@ -95,7 +95,7 @@ jobs:
9595
platforms: "linux/amd64,linux/arm/v7,linux/arm64"
9696
push: no
9797
steps:
98-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
98+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
9999
with:
100100
submodules: recursive
101101

‎.github/workflows/macOS.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
build-check:
4545
runs-on: macos-14
4646
steps:
47-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
47+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4848
with:
4949
submodules: recursive
5050
- name: Bootstrap

‎.github/workflows/meshcop.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
matrix:
5050
mdns: ["openthread", "avahi"]
5151
steps:
52-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
52+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5353
with:
5454
submodules: recursive
5555
- name: Bootstrap

‎.github/workflows/ncp_mode.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
OTBR_VERBOSE: 1
5656
OTBR_OPTIONS: "-DCMAKE_BUILD_TYPE=Debug -DOT_THREAD_VERSION=1.4 -DOTBR_MDNS=${{ matrix.mdns }} -DOTBR_COVERAGE=ON -DOTBR_DBUS=ON -DOTBR_FEATURE_FLAGS=ON -DOTBR_TELEMETRY_DATA_API=ON -DOTBR_UNSECURE_JOIN=ON -DOTBR_SRP_ADVERTISING_PROXY=ON -DBUILD_TESTING=OFF"
5757
steps:
58-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
58+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5959
with:
6060
submodules: recursive
6161
- name: Bootstrap

‎.github/workflows/openwrt.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
openwrt:
4545
runs-on: ubuntu-latest
4646
steps:
47-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
47+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4848
with:
4949
submodules: recursive
5050
- name: Bootstrap

‎.github/workflows/raspbian.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
IMAGE_URL: ${{ matrix.image_url }}
5555
BUILD_TARGET: raspbian-gcc
5656
steps:
57-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
57+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5858
with:
5959
submodules: recursive
6060
- name: Bootstrap

‎CMakeLists.txt‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,13 @@ add_compile_options(-Wall -Wextra -Werror -Wfatal-errors -Wuninitialized -Wno-mi
3333

3434
add_library(otbr-config INTERFACE)
3535

36+
if(OTBR_VENDOR_NAME AND OTBR_PRODUCT_NAME)
37+
set(OTBR_NAME "${OTBR_VENDOR_NAME}_${OTBR_PRODUCT_NAME}" CACHE STRING "The package name")
38+
else()
39+
set(OTBR_NAME "OpenThread_BorderRouter" CACHE STRING "The package name")
40+
endif()
41+
3642
set(OTBR_INFRA_IF_NAME "wlan0" CACHE STRING "The infrastructure interface name")
37-
set(OTBR_VENDOR_NAME "OpenThread" CACHE STRING "The vendor name")
38-
set(OTBR_PRODUCT_NAME "BorderRouter" CACHE STRING "The product name")
39-
set(OTBR_NAME "${OTBR_VENDOR_NAME}_${OTBR_PRODUCT_NAME}" CACHE STRING "The package name")
40-
set(OTBR_MESHCOP_SERVICE_INSTANCE_NAME "${OTBR_VENDOR_NAME} ${OTBR_PRODUCT_NAME}" CACHE STRING "The OTBR MeshCoP service instance name")
4143
set(OTBR_MDNS "openthread" CACHE STRING "mDNS publisher provider")
4244
set(OTBR_SYSLOG_FACILITY_ID LOG_USER CACHE STRING "Syslog logging facility")
4345
set(OTBR_RADIO_URL "spinel+hdlc+uart:///dev/ttyACM0" CACHE STRING "The radio URL")
@@ -88,14 +90,21 @@ target_include_directories(otbr-config INTERFACE
8890
${PROJECT_SOURCE_DIR}/src
8991
)
9092
target_compile_definitions(otbr-config INTERFACE
91-
"OTBR_VENDOR_NAME=\"${OTBR_VENDOR_NAME}\""
92-
"OTBR_PRODUCT_NAME=\"${OTBR_PRODUCT_NAME}\""
9393
"OTBR_PACKAGE_NAME=\"${OTBR_NAME}\""
9494
"OTBR_PACKAGE_VERSION=\"${OTBR_VERSION}\""
95-
"OTBR_MESHCOP_SERVICE_INSTANCE_NAME=\"${OTBR_MESHCOP_SERVICE_INSTANCE_NAME}\""
9695
"OTBR_SYSLOG_FACILITY_ID=${OTBR_SYSLOG_FACILITY_ID}"
9796
)
9897

98+
if(OTBR_VENDOR_NAME)
99+
target_compile_definitions(otbr-config INTERFACE "OTBR_VENDOR_NAME=\"${OTBR_VENDOR_NAME}\"")
100+
endif()
101+
if(OTBR_PRODUCT_NAME)
102+
target_compile_definitions(otbr-config INTERFACE "OTBR_PRODUCT_NAME=\"${OTBR_PRODUCT_NAME}\"")
103+
endif()
104+
if(OTBR_MESHCOP_SERVICE_INSTANCE_NAME)
105+
target_compile_definitions(otbr-config INTERFACE "OTBR_MESHCOP_SERVICE_INSTANCE_NAME=\"${OTBR_MESHCOP_SERVICE_INSTANCE_NAME}\"")
106+
endif()
107+
99108
if(BUILD_SHARED_LIBS)
100109
target_link_libraries(otbr-config INTERFACE -Wl,--unresolved-symbols=ignore-in-shared-libs)
101110
endif()

0 commit comments

Comments
 (0)