Skip to content

Commit 5016fa1

Browse files
authored
Merge branch 'master' into minimal_printf_default
2 parents 0f2b0d1 + 744889a commit 5016fa1

File tree

742 files changed

+34136
-13612
lines changed

Some content is hidden

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

742 files changed

+34136
-13612
lines changed

.mergify.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ pull_request_rules:
3939
conditions:
4040
# Travis failing
4141
- status-failure~=continuous-integration/travis-ci/pr
42+
- "label!=mergify skip"
4243
actions:
4344
label:
4445
add: ['needs: work']
@@ -49,6 +50,7 @@ pull_request_rules:
4950
conditions:
5051
# Jenkins CI failing
5152
- status-failure~=continuous-integration/jenkins/pr-head
53+
- "label!=mergify skip"
5254
actions:
5355
label:
5456
add: ['needs: work']
@@ -59,6 +61,7 @@ pull_request_rules:
5961
conditions:
6062
# Jenkins CI failing - any of the pipeline
6163
- status-failure~=^jenkins-ci
64+
- "label!=mergify skip"
6265
actions:
6366
label:
6467
add: ['needs: work']
@@ -120,6 +123,7 @@ pull_request_rules:
120123
conditions:
121124
# Labels
122125
- "label!=do not merge"
126+
- "label!=mergify skip"
123127
- "label=needs: CI"
124128

125129
# Reviewers

.travis.yml

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,40 @@ matrix:
5555
- <<: *basic-vm
5656
name: "license check"
5757
env: NAME=licence_check
58+
language: python
59+
python: 3.6.8 # scancode-toolkit v3.1.1 requires v3.6.8
60+
install:
61+
- pip install scancode-toolkit==3.1.1
62+
before_script:
63+
- mkdir -p SCANCODE
64+
# Fetch remaining information needed for branch comparison
65+
- git fetch --all --unshallow --tags
66+
- git fetch origin "${TRAVIS_BRANCH}"
5867
script:
68+
# scancode does not support list of files, only one file or directory
69+
# we use SCANCODE directory for all changed files (their copies with full tree)
70+
- >-
71+
git diff --name-only --diff-filter=d FETCH_HEAD..HEAD \
72+
| ( grep '.\(c\|cpp\|h\|hpp\|py\)$' || true ) \
73+
| ( grep -v '^tools/test/toolchains/api_test.py' || true ) \
74+
| while read file; do cp --parents "${file}" SCANCODE; done
75+
- scancode -l --json-pp scancode.json SCANCODE
76+
- python ./tools/test/travis-ci/scancode-evaluate.py -f scancode.json || true
77+
after_success:
78+
- python ./tools/test/travis-ci/scancode-evaluate.py -f scancode.json
79+
- cat scancode-evaluate.log
80+
- retval=$?
5981
- |
60-
! grep --recursive --max-count=100 --ignore-case --exclude .travis.yml \
61-
"gnu general\|gnu lesser\|lesser general\|public license"
82+
if [ $retval == 0 ]; then
83+
echo "License check OK";
84+
else
85+
echo "License check failed, please review license issues found";
86+
COUNT=$(cat scancode-evaluate.log | grep File: | wc -l)
87+
STATUSM="Needs review, ${COUNT} license issues found";
88+
set_status "success" "$STATUSM";
89+
fi
90+
91+
6292
6393
- <<: *basic-vm
6494
name: "include check"

TESTS/events/queue/main.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* mbed Microcontroller Library
22
* Copyright (c) 2017-2019 ARM Limited
3+
* SPDX-License-Identifier: Apache-2.0
34
*
45
* Licensed under the Apache License, Version 2.0 (the "License");
56
* you may not use this file except in compliance with the License.

TESTS/events/timing/main.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* mbed Microcontroller Library
22
* Copyright (c) 2017 ARM Limited
3+
* SPDX-License-Identifier: Apache-2.0
34
*
45
* Licensed under the Apache License, Version 2.0 (the "License");
56
* you may not use this file except in compliance with the License.

TESTS/host_tests/crash_reporting.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"""
22
Copyright (c) 2018 ARM Limited
3+
SPDX-License-Identifier: Apache-2.0
34
45
Licensed under the Apache License, Version 2.0 (the "License");
56
you may not use this file except in compliance with the License.

TESTS/host_tests/device_echo.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
2-
mbed SDK
3-
Copyright (c) 2011-2016 ARM Limited
2+
Copyright (c) 2011-2020, Arm Limited and affiliates
3+
SPDX-License-Identifier: Apache-2.0
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

TESTS/host_tests/rtc_calc_auto.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
2-
mbed SDK
3-
Copyright (c) 2011-2013 ARM Limited
2+
Copyright (c) 2011-2020, Arm Limited and affiliates
3+
SPDX-License-Identifier: Apache-2.0
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

TESTS/host_tests/rtc_reset.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"""
22
mbed SDK
33
Copyright (c) 2017-2017 ARM Limited
4+
SPDX-License-Identifier: Apache-2.0
45
56
Licensed under the Apache License, Version 2.0 (the "License");
67
you may not use this file except in compliance with the License.

TESTS/host_tests/system_reset.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"""
22
Copyright (c) 2018 ARM Limited
3+
SPDX-License-Identifier: Apache-2.0
34
45
Licensed under the Apache License, Version 2.0 (the "License");
56
you may not use this file except in compliance with the License.

TESTS/host_tests/timing_drift_auto.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"""
22
mbed SDK
33
Copyright (c) 2011-2013 ARM Limited
4+
SPDX-License-Identifier: Apache-2.0
45
56
Licensed under the Apache License, Version 2.0 (the "License");
67
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)