Skip to content

Commit 6b6cab7

Browse files
authored
Merge branch 'master' into corrections_in_STM_canapi
2 parents c63b14a + 4440041 commit 6b6cab7

File tree

1,170 files changed

+133932
-20275
lines changed

Some content is hidden

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

1,170 files changed

+133932
-20275
lines changed

.codecheckignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
^connectivity/libraries/ppp
77
^connectivity/drivers/emac
88
^connectivity/drivers/mbedtls
9+
^connectivity/drivers/wifi/COMPONENT_WHD
910
^connectivity/mbedtls
1011
^features/frameworks
1112
^connectivity/lwipstack/lwip

.github/workflows/main.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
on:
2+
issues:
3+
types: [ opened, reopened ]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- name: Checkout repo
11+
uses: actions/checkout@v2
12+
13+
- name: Install Python environment
14+
uses: actions/setup-python@v2
15+
with:
16+
python-version: 3.8
17+
18+
- name: Checkout mbed-os-scripts repo (This repo is currently private)
19+
uses: actions/checkout@v2
20+
with:
21+
repository: ARMmbed/mbed-os-ci-scripts
22+
token: ${{ secrets.ISSUE_TRIAGING_PERMS }}
23+
path: scripts
24+
ref: mbed-os-ci-scripts
25+
26+
- name: Run the script
27+
run: |
28+
python -m pip install pygithub
29+
python ./scripts/issue_triaging/__init__.py -i ${{github.event.issue.number}} -r ${{ github.event.repository.name }} -t ${{ secrets.ISSUE_TRIAGING_PERMS }}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,5 @@ DELIVERY/
102102
CMakeCache.txt
103103
cmake_install.cmake
104104
CMakeFiles/
105+
cmake_build/
106+
Testing/

.travis.yml

Lines changed: 71 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,11 @@ addons:
3939
- sourceline: 'deb https://apt.kitware.com/ubuntu/ focal main'
4040
key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
4141
packages:
42-
- cmake
43-
- ninja-build
44-
- libncursesw5
42+
- cmake
43+
- ninja-build
44+
- gcovr
45+
- libncursesw5
46+
- g++-7
4547

4648
matrix:
4749
include:
@@ -66,9 +68,8 @@ matrix:
6668
before_script:
6769
- mkdir -p SCANCODE
6870
- mkdir -p SCANCODE_NEW_FILES
69-
# Fetch remaining information needed for branch comparison
70-
- git fetch --all --unshallow --tags
71-
- git fetch origin "${TRAVIS_BRANCH}"
71+
# Fetch the base branch to compare against
72+
- git fetch origin "${TRAVIS_BRANCH}" --depth=1
7273
script:
7374
# scancode does not support list of files, only one file or directory
7475
# we use SCANCODE directory for all changed files (their copies with full tree)
@@ -104,6 +105,12 @@ matrix:
104105
false;
105106
fi
106107
108+
- <<: *basic-vm
109+
name: "UTF-8 Check"
110+
script:
111+
# Make sure we're not introducing any text which is not UTF-8 encoded
112+
- git diff $TRAVIS_BRANCH...HEAD -U0 | ( grep -a '^+' || true ) | ( ! grep -axv '.*' )
113+
107114
- <<: *basic-vm
108115
name: "include check"
109116
env: NAME=include_check
@@ -128,9 +135,8 @@ matrix:
128135
export PATH="${PWD}/bin:${PATH}";
129136
cd -
130137
- astyle --version
131-
# Fetch remaining information needed for branch comparison
132-
- git fetch --all --unshallow --tags
133-
- git fetch origin "${TRAVIS_BRANCH}"
138+
# Fetch the base branch to compare against
139+
- git fetch origin "${TRAVIS_BRANCH}" --depth=1
134140
script:
135141
- >-
136142
git diff --name-only --diff-filter=d FETCH_HEAD..HEAD \
@@ -189,35 +195,6 @@ matrix:
189195
find -name "*.s" | tee BUILD/badasm |
190196
sed -e "s/^/Bad Assembler file name found: /" && [ ! -s BUILD/badasm ]
191197
192-
- <<: *docs-vm
193-
name: "Frozen tools check"
194-
env: NAME=frozen_tools_check
195-
script:
196-
# Reject any changes to tools that would require a re-release of the
197-
# tools for the online compiler.
198-
- >-
199-
frozen_files=`\
200-
git diff --name-only --diff-filter=d FETCH_HEAD..HEAD \
201-
| egrep \
202-
-e "^tools/build_api*" \
203-
-e "^tools/config*" \
204-
-e "^tools/export*" \
205-
-e "^tools/notifier*" \
206-
-e "^tools/paths*" \
207-
-e "^tools/resources*" \
208-
-e "^tools/targets*" \
209-
-e "^tools/toolchains*" \
210-
-e "^tools/utils*" \
211-
-e "^$"`
212-
if [ -z "$frozen_files" ]; then
213-
echo "Success!";
214-
else
215-
echo -e "Failure: Frozen files were modified\n$frozen_files";
216-
echo -e "Please see https://os.mbed.com/blog/entry/Introducing-the-new-Mbed-Tools/" \
217-
"\nfor why we've frozen the legacy tools.";
218-
false;
219-
fi
220-
221198
### Python Tests ###
222199
- &pytools-vm
223200
stage: "Pytest"
@@ -273,9 +250,8 @@ matrix:
273250
- python -m pip install --upgrade setuptools==40.4.3
274251
- pip install tabulate argparse
275252
- pip list --verbose
276-
# Fetch remaining information needed for branch comparison
277-
- git fetch --all --unshallow --tags
278-
- git fetch origin "${TRAVIS_BRANCH}"
253+
# Fetch the base branch to compare against
254+
- git fetch origin "${TRAVIS_BRANCH}" --depth=1
279255
script:
280256
- >-
281257
git diff --name-only --diff-filter=d FETCH_HEAD..HEAD \
@@ -321,3 +297,57 @@ matrix:
321297
- mbedtools configure -p ${ROOT} -t ${TOOLCHAIN} -m ${TARGET_NAME} --mbed-os-path .
322298
- cmake -S ${ROOT} -B ${ROOT}/cmake_build/${TARGET_NAME}/${PROFILE}/${TOOLCHAIN}/ -GNinja -DCMAKE_BUILD_TYPE=${PROFILE}
323299
- cmake --build ${ROOT}/cmake_build/${TARGET_NAME}/${PROFILE}/${TOOLCHAIN}/
300+
301+
### Mbed OS unittest ###
302+
- &cmake-build-run-unittest
303+
stage: "CMake"
304+
name: "CMake unittest build"
305+
env: NAME=cmake_unittest
306+
install:
307+
# Hide Travis-preinstalled CMake
308+
# The Travis-preinstalled CMake is unfortunately not installed via apt, so we
309+
# can't replace it with an apt-supplied version very easily. Additionally, we
310+
# can't permit the Travis-preinstalled copy to survive, as the Travis default
311+
# path lists the Travis CMake install location ahead of any place where apt
312+
# would install CMake to. Instead of apt removing or upgrading to a new CMake
313+
# version, we must instead delete the Travis copy of CMake.
314+
- sudo rm -rf /usr/local/cmake*
315+
script:
316+
- echo ctest --build-and-test . build --build-generator Ninja --build-options -DBUILD_TESTING=ON -DCMAKE_BUILD_TYPE=Debug -DCOVERAGE=ON -DCMAKE_CXX_COMPILER=g++-7 -DCMAKE_C_COMPILER=gcc-7 --test-command ctest
317+
- ctest --build-and-test . build --build-generator Ninja --build-options -DBUILD_TESTING=ON -DCMAKE_BUILD_TYPE=Debug -DCOVERAGE=ON -DCMAKE_CXX_COMPILER=g++-7 -DCMAKE_C_COMPILER=gcc-7 --test-command ctest
318+
- gcovr --gcov-executable gcov-7 -r . ./build -s -e ".*\.h" --exclude-directories=$TRAVIS_BUILD_DIR/build/UNITTESTS --exclude-directories=$TRAVIS_BUILD_DIR/build/_deps
319+
- ccache -s
320+
321+
### Frozen tools check ###
322+
- &frozen-tools-vm
323+
stage: "Frozen tools check"
324+
name: "Frozen tools check"
325+
env: NAME=frozen_tools_check
326+
before_script:
327+
# Fetch the base branch to compare against
328+
- git fetch origin "${TRAVIS_BRANCH}" --depth=1
329+
script:
330+
# Reject any changes to tools that would require a re-release of the
331+
# tools for the online compiler.
332+
- >-
333+
frozen_files=`\
334+
git diff --name-only FETCH_HEAD..HEAD \
335+
| egrep \
336+
-e "^tools/build_api*" \
337+
-e "^tools/config*" \
338+
-e "^tools/export*" \
339+
-e "^tools/notifier*" \
340+
-e "^tools/paths*" \
341+
-e "^tools/resources*" \
342+
-e "^tools/targets*" \
343+
-e "^tools/toolchains*" \
344+
-e "^tools/utils*" \
345+
-e "^$"`
346+
if [ -z "$frozen_files" ]; then
347+
echo "Success!";
348+
else
349+
echo -e "Failure: Frozen files were modified\n$frozen_files";
350+
echo -e "Please see https://os.mbed.com/blog/entry/Introducing-the-new-Mbed-Tools/" \
351+
"\nfor why we've frozen the legacy tools.";
352+
false;
353+
fi

0 commit comments

Comments
 (0)