forked from zephyrproject-rtos/zephyr
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request zephyrproject-rtos#29 from trond-snekvik/mesh_1_1_…
…merge_2021_02_22 Merge upstream Zephyr 2021-02-22
- Loading branch information
Showing
7,532 changed files
with
345,335 additions
and
108,123 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,14 +3,14 @@ steps: | |
| - .buildkite/run.sh | ||
| env: | ||
| ZEPHYR_TOOLCHAIN_VARIANT: "zephyr" | ||
| ZEPHYR_SDK_INSTALL_DIR: "/opt/sdk/zephyr-sdk-0.11.3" | ||
| parallelism: 120 | ||
| ZEPHYR_SDK_INSTALL_DIR: "/opt/sdk/zephyr-sdk-0.12.3" | ||
| parallelism: 400 | ||
| timeout_in_minutes: 210 | ||
| retry: | ||
| manual: true | ||
| plugins: | ||
| - docker#v3.5.0: | ||
| image: "zephyrprojectrtos/ci:v0.11.8" | ||
| image: "zephyrprojectrtos/ci:v0.11.15" | ||
| propagate-environment: true | ||
| volumes: | ||
| - "/var/lib/buildkite-agent/git-mirrors:/var/lib/buildkite-agent/git-mirrors" | ||
|
|
@@ -25,7 +25,7 @@ steps: | |
|
|
||
| - plugins: | ||
| - junit-annotate#v1.7.0: | ||
| artifacts: sanitycheck-*.xml | ||
| artifacts: twister-*.xml | ||
|
|
||
| notify: | ||
| - email: "[email protected]" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| name: Backport | ||
| on: | ||
| pull_request_target: | ||
| types: | ||
| - closed | ||
| - labeled | ||
| branches: | ||
| - master | ||
|
|
||
| jobs: | ||
| backport: | ||
| runs-on: ubuntu-18.04 | ||
| name: Backport | ||
| steps: | ||
| - name: Backport | ||
| uses: zephyrproject-rtos/[email protected] | ||
| with: | ||
| github_token: ${{ secrets.ZB_GITHUB_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,8 +7,15 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| name: Run compliance checks on patch series (PR) | ||
| steps: | ||
| - name: Update PATH for west | ||
| run: | | ||
| echo "$HOME/.local/bin" >> $GITHUB_PATH | ||
| - name: Checkout the code | ||
| uses: actions/checkout@v1 | ||
| uses: actions/checkout@v2 | ||
| with: | ||
| ref: ${{ github.event.pull_request.head.sha }} | ||
| fetch-depth: 0 | ||
|
|
||
| - name: cache-pip | ||
| uses: actions/cache@v1 | ||
|
|
@@ -20,20 +27,33 @@ jobs: | |
| run: | | ||
| pip3 install setuptools | ||
| pip3 install wheel | ||
| pip3 install python-magic junitparser gitlint pylint pykwalify | ||
| pip3 install python-magic junitparser==1.6.3 gitlint pylint pykwalify | ||
| pip3 install west | ||
| - name: Run Compliance Tests | ||
| id: compliance | ||
| - name: west setup | ||
| env: | ||
| BASE_REF: ${{ github.base_ref }} | ||
| run: | | ||
| export PATH=$PATH:~/.local/bin | ||
| export ZEPHYR_BASE=$PWD | ||
| git config --global user.email "[email protected]" | ||
| git config --global user.name "Your Name" | ||
| git remote -v | ||
| git rebase origin/${BASE_REF} | ||
| ./scripts/ci/check_compliance.py -m Codeowners -m Devicetree -m Gitlint -m Identity -m Nits -m pylint -m checkpatch -m Kconfig -c origin/${BASE_REF}.. || true | ||
| # debug | ||
| git log --pretty=oneline | head -n 10 | ||
| west init -l . || true | ||
| west update | ||
| - name: Run Compliance Tests | ||
| continue-on-error: true | ||
| id: compliance | ||
| env: | ||
| BASE_REF: ${{ github.base_ref }} | ||
| run: | | ||
| export ZEPHYR_BASE=$PWD | ||
| # debug | ||
| ls -la | ||
| git log --pretty=oneline | head -n 10 | ||
| ./scripts/ci/check_compliance.py -m Codeowners -m Devicetree -m Gitlint -m Identity -m Nits -m pylint -m checkpatch -m Kconfig -c origin/${BASE_REF}.. | ||
| - name: upload-results | ||
| uses: actions/upload-artifact@master | ||
|
|
@@ -44,71 +64,21 @@ jobs: | |
|
|
||
| - name: check-warns | ||
| run: | | ||
| if [ -s Nits.txt ]; then | ||
| errors=$(cat Nits.txt) | ||
| errors="${errors//'%'/'%25'}" | ||
| errors="${errors//$'\n'/'%0A'}" | ||
| errors="${errors//$'\r'/'%0D'}" | ||
| echo "::error file=Nits.txt::$errors" | ||
| exit=1 | ||
| fi | ||
| if [ -s checkpatch.txt ]; then | ||
| errors=$(cat checkpatch.txt) | ||
| errors="${errors//'%'/'%25'}" | ||
| errors="${errors//$'\n'/'%0A'}" | ||
| errors="${errors//$'\r'/'%0D'}" | ||
| echo "::error file=Checkpatch.txt::$errors" | ||
| exit=1 | ||
| fi | ||
| if [ -s Identity.txt ]; then | ||
| errors=$(cat Identity.txt) | ||
| errors="${errors//'%'/'%25'}" | ||
| errors="${errors//$'\n'/'%0A'}" | ||
| errors="${errors//$'\r'/'%0D'}" | ||
| echo "::error file=Identity.txt::$errors" | ||
| exit=1 | ||
| fi | ||
| if [ -s Gitlint.txt ]; then | ||
| errors=$(cat Gitlint.txt) | ||
| errors="${errors//'%'/'%25'}" | ||
| errors="${errors//$'\n'/'%0A'}" | ||
| errors="${errors//$'\r'/'%0D'}" | ||
| echo "::error file=Gitlint.txt::$errors" | ||
| exit=1 | ||
| fi | ||
| if [ -s pylint.txt ]; then | ||
| errors=$(cat pylint.txt) | ||
| errors="${errors//'%'/'%25'}" | ||
| errors="${errors//$'\n'/'%0A'}" | ||
| errors="${errors//$'\r'/'%0D'}" | ||
| echo "::error file=pylint.txt::$errors" | ||
| exit=1 | ||
| fi | ||
| if [ -s Devicetree.txt ]; then | ||
| errors=$(cat Devicetree.txt) | ||
| errors="${errors//'%'/'%25'}" | ||
| errors="${errors//$'\n'/'%0A'}" | ||
| errors="${errors//$'\r'/'%0D'}" | ||
| echo "::error file=Devicetree.txt::$errors" | ||
| exit=1 | ||
| fi | ||
| if [ -s Kconfig.txt ]; then | ||
| errors=$(cat Kconfig.txt) | ||
| errors="${errors//'%'/'%25'}" | ||
| errors="${errors//$'\n'/'%0A'}" | ||
| errors="${errors//$'\r'/'%0D'}" | ||
| echo "::error file=Kconfig.txt::$errors" | ||
| exit=1 | ||
| fi | ||
| if [ -s Codeowners.txt ]; then | ||
| errors=$(cat Codeowners.txt) | ||
| errors="${errors//'%'/'%25'}" | ||
| errors="${errors//$'\n'/'%0A'}" | ||
| errors="${errors//$'\r'/'%0D'}" | ||
| echo "::error file=Codeowners.txt::$errors" | ||
| exit=1 | ||
| if [[ ! -s "compliance.xml" ]]; then | ||
| exit 1; | ||
| fi | ||
| for file in Nits.txt checkpatch.txt Identity.txt Gitlint.txt pylint.txt Devicetree.txt Kconfig.txt Codeowners.txt; do | ||
| if [[ -s $file ]]; then | ||
| errors=$(cat $file) | ||
| errors="${errors//'%'/'%25'}" | ||
| errors="${errors//$'\n'/'%0A'}" | ||
| errors="${errors//$'\r'/'%0D'}" | ||
| echo "::error file=${file}::$errors" | ||
| exit=1 | ||
| fi | ||
| done | ||
| if [ ${exit} == 1 ]; then | ||
| exit 1; | ||
| fi | ||
Oops, something went wrong.