Skip to content

Commit

Permalink
Merge branch 'master' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
abiradarti authored Jun 23, 2022
2 parents e2bfd9e + 2517dd5 commit 785132b
Show file tree
Hide file tree
Showing 1,382 changed files with 426,067 additions and 290,139 deletions.
5 changes: 4 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ RUN apt-get -fy install git vim emacs sudo \
wget curl telnet \
docker.io \
iputils-ping net-tools \
libncurses5
libncurses5 \
libpython2.7

RUN groupadd -g $USER_GID $USERNAME
RUN useradd -s /bin/bash -u $USER_UID -g $USER_GID -G docker -m $USERNAME
Expand Down Expand Up @@ -83,3 +84,5 @@ RUN sed -i '/^TIZEN_SDK_DATA_PATH/d' $TIZEN_SDK_ROOT/sdk.info \
&& echo TIZEN_SDK_DATA_PATH=/home/$USERNAME/tizen-sdk-data >> $TIZEN_SDK_ROOT/sdk.info \
&& ln -sf /home/$USERNAME/.tizen-cli-config $TIZEN_SDK_ROOT/tools/.tizen-cli-config \
&& : # last line

ENV TIZEN_ROOTFS /tizen_rootfs
27 changes: 14 additions & 13 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,30 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"BUILD_VERSION": "0.5.77"
"BUILD_VERSION": "0.5.79"
}
},
"remoteUser": "vscode",
// Add the IDs of extensions you want installed when the container is created in the array below.
"extensions": [
"ms-azuretools.vscode-docker",
"xaver.clang-format",
"github.vscode-pull-request-github",
"maelvalais.autoconf",
"yzhang.markdown-all-in-one",
"eamodio.gitlens",
"yuichinukiyama.vscode-preview-server",
"aaron-bond.better-comments",
"foxundermoon.shell-format",
"augustocdias.tasks-shell-input",
"christian-kohler.path-intellisense",
"eamodio.gitlens",
"editorconfig.editorconfig",
"esbenp.prettier-vscode",
"redhat.vscode-yaml",
"christian-kohler.path-intellisense",
"foxundermoon.shell-format",
"github.vscode-pull-request-github",
"knisterpeter.vscode-github",
"npclaudiu.vscode-gn",
"maelvalais.autoconf",
"marus25.cortex-debug",
"msedge-dev.gnls"
"ms-azuretools.vscode-docker",
"msedge-dev.gnls",
"npclaudiu.vscode-gn",
"redhat.vscode-yaml",
"xaver.clang-format",
"yuichinukiyama.vscode-preview-server",
"yzhang.markdown-all-in-one"
],
// Use 'settings' to set *default* container specific settings.json values on container create.
// You can edit these settings after create using File > Preferences > Settings > Remote.
Expand Down
3 changes: 3 additions & 0 deletions .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,7 @@ FW
gbl
gcloud
GDB
gdbserver
GeneralCommissioning
GeneralDiagnostics
GenericConfigurationManagerImpl
Expand Down Expand Up @@ -740,6 +741,7 @@ libwebkitgtk
lifecycle
lightbulb
lightin
LightingApp
LightingColor
LightingState
LinkSoftwareAndDocumentationPack
Expand Down Expand Up @@ -1126,6 +1128,7 @@ scm
sco
scp
ScriptBinding
SDB
SDC
SDHC
SDK
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 @@ -30,7 +30,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: connectedhomeip/chip-build:0.5.77
image: connectedhomeip/chip-build:0.5.79

steps:
- uses: Wandalen/[email protected]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.5.77
image: connectedhomeip/chip-build:0.5.79
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.5.77
image: connectedhomeip/chip-build:0.5.79
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -237,7 +237,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.5.77
image: connectedhomeip/chip-build:0.5.79
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down
31 changes: 3 additions & 28 deletions .github/workflows/chef.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,36 +24,13 @@ concurrency:

jobs:

validate_zzz:
name: Chef - Validate cached ZAP output
runs-on: ubuntu-latest
if: github.actor != 'restyled-io[bot]'
container:
image: connectedhomeip/chip-build:0.5.77
options: --user root
steps:
- uses: Wandalen/[email protected]
name: Checkout
with:
action: actions/checkout@v3
with: |
token: ${{ github.token }}
attempt_limit: 3
attempt_delay: 2000
- name: Chef validate zzz
shell: bash
run: |
cd examples/chef
python3 chef.py --validate_zzz
chef_linux:
name: Chef - Linux CI Examples
needs: validate_zzz
runs-on: ubuntu-latest
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.5.77
image: connectedhomeip/chip-build:0.5.79
options: --user root

steps:
Expand All @@ -72,12 +49,11 @@ jobs:
chef_esp32:
name: Chef - ESP32 CI Examples
needs: validate_zzz
runs-on: ubuntu-latest
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-esp32:0.5.77
image: connectedhomeip/chip-build-esp32:0.5.79
options: --user root

steps:
Expand All @@ -96,12 +72,11 @@ jobs:
chef_nrfconnect:
name: Chef - NRFConnect CI Examples
needs: validate_zzz
runs-on: ubuntu-latest
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-nrf-platform:0.5.77
image: connectedhomeip/chip-build-nrf-platform:0.5.79
options: --user root

steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cirque.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
# need to run with privilege, which isn't supported by job.XXX.contaner
# https://github.com/actions/container-action/issues/2
# container:
# image: connectedhomeip/chip-build-cirque:0.5.77
# image: connectedhomeip/chip-build-cirque:0.5.79
# volumes:
# - "/tmp:/tmp"
# - "/dev/pts:/dev/pts"
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
${{ runner.os }}-cirque-
- name: Bootstrap
timeout-minutes: 10
timeout-minutes: 15
run: |
integrations/docker/images/chip-build-cirque/run.sh \
--env GITHUB_ACTION_RUN=1 \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/darwin-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ concurrency:
jobs:
test_suites_chip_tool_darwin:
name: Test Suites - Darwin
timeout-minutes: 135
timeout-minutes: 150

strategy:
matrix:
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
.environment/gn_out/.ninja_log
.environment/pigweed-venv/*.log
- name: Build Apps
timeout-minutes: 45
timeout-minutes: 60
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doxygen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:

runs-on: ubuntu-20.04
container:
image: connectedhomeip/chip-build-doxygen:0.5.77
image: connectedhomeip/chip-build-doxygen:0.5.79

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 @@ -32,7 +32,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-ameba:0.5.77
image: connectedhomeip/chip-build-ameba:0.5.79
options: --user root

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

container:
image: connectedhomeip/chip-build-ti:0.5.77
image: connectedhomeip/chip-build-ti:0.5.79
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
Loading

0 comments on commit 785132b

Please sign in to comment.