Skip to content

Commit

Permalink
[Realtek] Fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
pankore committed Feb 17, 2025
2 parents 4e82601 + 7c1d6f7 commit c727e0e
Show file tree
Hide file tree
Showing 564 changed files with 32,051 additions and 22,386 deletions.
8 changes: 4 additions & 4 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,24 +54,24 @@ RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/resty
&& chmod +x /usr/local/bin/restyle-path \
&& :

RUN mkdir -p /opt/sdk/sdks/ \
RUN mkdir -p /opt/android/sdk \
&& chown -R $USERNAME:$USERNAME \
/opt/sdk/sdks/ `# NXP uses a patch_sdk script to change SDK files` \
/opt/android/sdk `# NXP uses a patch_sdk script to change SDK files` \
$ANDROID_HOME \
$IDF_TOOLS_PATH \
&& find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
&& find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
&& find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
&& find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
&& chmod -R +x \
$ANDROID_HOME/tools/bin `# sdkmanager for accepting licenses`\
$ANDROID_HOME/cmdline-tools/10.0/bin `# sdkmanager for accepting licenses`\
&& chmod -R +w \
$IDF_TOOLS_PATH \
&& find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chmod -R +w \
&& find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chmod -R +w \
&& find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chmod -R +w \
&& find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chmod -R +w \
# Safe directory is preffered over chown.
# Safe directory is preferred over chown.
&& git config --global --add safe.directory "*" \
&& :

Expand Down
9 changes: 9 additions & 0 deletions .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ amebad
amebaiot
AmebaZ
amebaz2
ANC
announcementReason
AnnounceOTAProvider
AnnounceOTAProviderRequest
Expand Down Expand Up @@ -85,6 +86,7 @@ ASR
AssertionError
AST
ASYNC
ATL
ATLs
atomics
att
Expand Down Expand Up @@ -114,6 +116,7 @@ avahi
avL
AwaitNextAction
AXXXF
Axxxx
AYNJV
babaf
backend
Expand Down Expand Up @@ -507,6 +510,7 @@ entrypoint
enum
Enums
env
EP
epochKey
epochStartTime
eq
Expand Down Expand Up @@ -538,6 +542,7 @@ ExtendedPAN
ExtensionEntry
extern
extpanid
Exx
FabricId
fabricIdx
fabricIndex
Expand Down Expand Up @@ -585,6 +590,7 @@ fuzzer
fuzzers
fuzztest
FW
Fxx
gbl
gcloud
GDB
Expand Down Expand Up @@ -684,6 +690,7 @@ ICMP
IDF
IDL
IDLs
IDM
idt
idx
ifconfig
Expand Down Expand Up @@ -1236,6 +1243,7 @@ RPi's
RPis
RSA
rsn
Rsp
RSSI
RST
rsync
Expand Down Expand Up @@ -1623,6 +1631,7 @@ xFFFF
xfffff
xFFFFFFEFFFFFFFFF
XMLPICSValidator
XMLs
xtensa
xvzf
xwayland
Expand Down
1 change: 1 addition & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ updates:
- dependency-name: "third_party/java_deps/repo"
- dependency-name: "third_party/jlink/repo"
- dependency-name: "third_party/jsoncpp/repo"
- dependency-name: "third_party/libdatachannel/repo"
- dependency-name: "third_party/libwebsockets/repo"
- dependency-name: "third_party/lwip/repo"
- dependency-name: "third_party/mbed-mcu-boot/repo"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bloat_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: ghcr.io/project-chip/chip-build:104
image: ghcr.io/project-chip/chip-build:112

steps:
- name: Checkout
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:104
image: ghcr.io/project-chip/chip-build:112
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:104
image: ghcr.io/project-chip/chip-build:112
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down Expand Up @@ -211,11 +211,16 @@ jobs:
- name: Find changed files
id: changed-files
uses: tj-actions/changed-files@v45
with:
# Exclude all files under "third_party/"
files-ignore: |
third_party/
- name: Clang-tidy validation
# NOTE: clang-tidy crashes on CodegenDataModel_Write due to Nullable/std::optional check.
# See https://github.com/llvm/llvm-project/issues/97426
env:
ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.changed_files }}
run: |
touch out/changed_files.txt
for file in ${ALL_CHANGED_FILES}; do
Expand Down Expand Up @@ -300,7 +305,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:104
image: ghcr.io/project-chip/chip-build:112
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down Expand Up @@ -365,7 +370,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:104
image: ghcr.io/project-chip/chip-build:112
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down Expand Up @@ -487,7 +492,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: ghcr.io/project-chip/chip-build:104
image: ghcr.io/project-chip/chip-build:112
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"

Expand All @@ -502,4 +507,3 @@ jobs:

- name: Run Build Coverage
run: ./scripts/build_coverage.sh --yaml

10 changes: 5 additions & 5 deletions .github/workflows/chef.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:104
image: ghcr.io/project-chip/chip-build:112
options: --user root

steps:
Expand All @@ -57,7 +57,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-esp32:104
image: ghcr.io/project-chip/chip-build-esp32:112
options: --user root

steps:
Expand All @@ -78,7 +78,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-nrf-platform:104
image: ghcr.io/project-chip/chip-build-nrf-platform:112
options: --user root

steps:
Expand All @@ -99,7 +99,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-telink:104
image: ghcr.io/project-chip/chip-build-telink:112
options: --user root

steps:
Expand All @@ -111,7 +111,7 @@ jobs:
platform: telink
# - name: Update Zephyr to specific revision (for developers purpose)
# shell: bash
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 52c23bb5bfa7b08fb2499fda8c34cbd3418e0c1d"
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ce4027fc0768b8509758af2e43f74e3fd2c7d58d"
- name: CI Examples Telink
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doxygen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:

runs-on: ubuntu-latest
container:
image: ghcr.io/project-chip/chip-build-doxygen:104
image: ghcr.io/project-chip/chip-build-doxygen:112

if: github.actor != 'restyled-io[bot]'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-ameba.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-ameba:104
image: ghcr.io/project-chip/chip-build-ameba:112
options: --user root

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-asr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-asr:104
image: ghcr.io/project-chip/chip-build-asr:112
options: --user root

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-bouffalolab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-bouffalolab:104
image: ghcr.io/project-chip/chip-build-bouffalolab:112
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-cc13xx_26xx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-ti:104
image: ghcr.io/project-chip/chip-build-ti:112
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-cc32xx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-ti:104
image: ghcr.io/project-chip/chip-build-ti:112
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-efr32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-efr32:104
image: ghcr.io/project-chip/chip-build-efr32:112
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/examples-esp32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-esp32:104
image: ghcr.io/project-chip/chip-build-esp32:112
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
if: github.actor != 'restyled-io[bot]' && github.repository_owner == 'espressif'

container:
image: ghcr.io/project-chip/chip-build-esp32:104
image: ghcr.io/project-chip/chip-build-esp32:112
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-infineon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-infineon:104
image: ghcr.io/project-chip/chip-build-infineon:112
env:
# TODO: this should probably be part of the dockerfile itself
CY_TOOLS_PATHS: /opt/Tools/ModusToolbox/tools_3.2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-linux-arm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-crosscompile:104
image: ghcr.io/project-chip/chip-build-crosscompile:112
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-linux-imx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-imx:104
image: ghcr.io/project-chip/chip-build-imx:112

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-linux-standalone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:104
image: ghcr.io/project-chip/chip-build:112
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-linux-tv-casting-app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:104
image: ghcr.io/project-chip/chip-build:112

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-mw320.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:104
image: ghcr.io/project-chip/chip-build:112
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-nrfconnect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-nrf-platform:104
image: ghcr.io/project-chip/chip-build-nrf-platform:112
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-nuttx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-nuttx:104
image: ghcr.io/project-chip/chip-build-nuttx:112
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
Loading

0 comments on commit c727e0e

Please sign in to comment.