Skip to content

Commit 6d70789

Browse files
committed
travis: fix checking out pybricks/micropython for tags
When we tag pybricks/pybricks-micropython, we want to be sure to use the matching tag from pybricks/micropython
1 parent 537c26e commit 6d70789

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.travis.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
- gcc --version
3232
- python3 --version
3333
- cd ${HOME}
34-
- git clone --depth=10 --recursive https://github.com/pybricks/micropython
3534
- if [ -n "$TRAVIS_TAG" ]; then
36-
MPY_TAG = $(git tag | grep pybricks$TRAVIS_TAG);
37-
git -C micropython checkout $MPY_TAG;
35+
git clone --depth=10 --branch=v1.9.4+pybricks${TRAVIS_TAG:1} --recursive https://github.com/pybricks/micropython;
36+
else
37+
git clone --depth=10 --recursive https://github.com/pybricks/micropython;
3838
fi
3939
- cd micropython/ports/pybricks
4040
- git checkout --recurse-submodules ${TRAVIS_PULL_REQUEST_BRANCH:-${TRAVIS_COMMIT}}
@@ -70,10 +70,10 @@ jobs:
7070
- sudo dpkg -i $HOME/fonts-roboto-slab_1.100263+20170512-1_all.deb
7171
- sudo apt-get install qemu-user-static inkscape fonts-lato
7272
- cd ${HOME}
73-
- git clone --depth=10 --recursive https://github.com/pybricks/micropython
7473
- if [ -n "$TRAVIS_TAG" ]; then
75-
MPY_TAG = $(git tag | grep pybricks$TRAVIS_TAG);
76-
git -C micropython checkout $MPY_TAG;
74+
git clone --depth=10 --branch=v1.9.4+pybricks${TRAVIS_TAG:1} --recursive https://github.com/pybricks/micropython;
75+
else
76+
git clone --depth=10 --recursive https://github.com/pybricks/micropython;
7777
fi
7878
- cd micropython/ports/pybricks
7979
- git checkout --recurse-submodules ${TRAVIS_PULL_REQUEST_BRANCH:-${TRAVIS_COMMIT}}
@@ -111,10 +111,10 @@ jobs:
111111
- cd ${HOME}
112112
- wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2
113113
- sudo tar -C /opt -xf gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2
114-
- git clone --depth=10 --recursive https://github.com/pybricks/micropython
115114
- if [ -n "$TRAVIS_TAG" ]; then
116-
MPY_TAG = $(git tag | grep pybricks$TRAVIS_TAG);
117-
git -C micropython checkout $MPY_TAG;
115+
git clone --depth=10 --branch=v1.9.4+pybricks${TRAVIS_TAG:1} --recursive https://github.com/pybricks/micropython;
116+
else
117+
git clone --depth=10 --recursive https://github.com/pybricks/micropython;
118118
fi
119119
- cd micropython/ports/pybricks
120120
- git checkout --recurse-submodules ${TRAVIS_PULL_REQUEST_BRANCH:-${TRAVIS_COMMIT}}

examples

0 commit comments

Comments
 (0)