Skip to content

Commit 4acd999

Browse files
committed
travis: Unshallow/get tags earlier.
* Fixes the version embedding into the firmware.
1 parent 8c5c7ce commit 4acd999

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

.travis/run.sh

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,18 +96,11 @@ for BOARD in $BOARDS; do
9696
echo "- No Github token so unable to copy built files"
9797
fi
9898
else
99-
echo ""
100-
echo ""
101-
echo ""
102-
echo "- Fetching non shallow to get git version"
103-
echo "---------------------------------------------"
104-
git fetch --unshallow && git fetch --tags
105-
GIT_REVISION=`git describe`
106-
echo "============================================="
10799
# Look at repo we are running in to determine where to try pushing to if in a fork
108100
COPY_REPO_OWNER=$(echo $TRAVIS_REPO_SLUG|awk -F'/' '{print $1}')
109101
echo "COPY_REPO_OWNER = $COPY_REPO_OWNER"
110102
COPY_REPO="HDMI2USB-firmware-prebuilt"
103+
GIT_REVISION=`git describe`
111104
COPY_DEST="archive/$GIT_REVISION/$BOARD/$TARGET"
112105
ORIG_COMMITTER_NAME=$(git log -1 --pretty=%an)
113106
ORIG_COMMITTER_EMAIL=$(git log -1 --pretty=%ae)

.travis/setup.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@
33
set -x
44
set -e
55

6+
echo ""
7+
echo ""
8+
echo ""
9+
echo "- Fetching non shallow to get git version"
10+
echo "---------------------------------------------"
11+
git fetch --unshallow && git fetch --tags
12+
GIT_REVISION=`git describe`
13+
echo "============================================="
14+
615
# Run the script once to check it works
716
time scripts/get-env.sh
817
# Run the script again to check it doesn't break things

0 commit comments

Comments
 (0)