Skip to content

Commit 908e263

Browse files
committed
Travis: switch to Mbed CLI 2
As Mbed CLI 2 + CMake is supported now, this PR switches Travis to test Mbed CLI 2 only. This aligns with all Mbed official examples.
1 parent e400791 commit 908e263

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

.travis.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ dist: focal
2020

2121
addons:
2222
apt:
23+
sources:
24+
- sourceline: 'deb https://apt.kitware.com/ubuntu/ focal main'
25+
key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
2326
packages:
2427
- cmake
2528
- srecord
@@ -49,11 +52,19 @@ matrix:
4952
install:
5053
# Install arm-none-eabi-gcc
5154
- pushd /home/travis/build && mkdir arm-gcc && cd arm-gcc
52-
- curl -L0 "https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2?revision=108bd959-44bd-4619-9c19-26187abf5225&la=en&hash=E788CE92E5DFD64B2A8C246BBA91A249CB8E2D2D" --output gcc-arm-none-eabi-9-2019-q4-major.tar.bz2
55+
- curl -L0 "https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2" --output gcc-arm-none-eabi-9-2019-q4-major.tar.bz2
5356
- tar xf gcc-arm-none-eabi-9-2019-q4-major.tar.bz2
5457
- export PATH="$PATH:${PWD}/gcc-arm-none-eabi-9-2019-q4-major/bin"
5558
- arm-none-eabi-gcc --version
5659
- popd
60+
# Hide Travis-preinstalled CMake
61+
# The Travis-preinstalled CMake is unfortunately not installed via apt, so we
62+
# can't replace it with an apt-supplied version very easily. Additionally, we
63+
# can't permit the Travis-preinstalled copy to survive, as the Travis default
64+
# path lists the Travis CMake install location ahead of any place where apt
65+
# would install CMake to. Instead of apt removing or upgrading to a new CMake
66+
# version, we must instead delete the Travis copy of CMake.
67+
- sudo rm -rf /usr/local/cmake*
5768
# Setup ccache
5869
- ccache -o compiler_check=content
5970
- ccache -M 1G
@@ -64,11 +75,11 @@ matrix:
6475
# Fetch mbed-os: We use manual clone, with depth=1 and --single-branch to save time.
6576
- git clone --depth=1 --single-branch https://github.com/ARMmbed/mbed-os.git
6677
# Install Mbed CLI and dependencies
67-
- pip install --upgrade mbed-cli
78+
- pip install --upgrade mbed-tools
6879
- pip install -r mbed-os/requirements.txt
6980
script:
7081
# Build TF-M and all tests
71-
- python3 test_psa_target.py -t GNUARM -m ${TARGET_NAME} -b
82+
- python3 test_psa_target.py -t GNUARM -m ${TARGET_NAME} --cli=2 -b
7283
- ccache -s
7384

7485
# ARM_MUSCA_B1

0 commit comments

Comments
 (0)