Skip to content

Commit 87b0a3f

Browse files
committed
Remove unnecessary builds, fixes build errors for the 'devel' branch
1 parent 2869e9b commit 87b0a3f

File tree

1 file changed

+7
-17
lines changed

1 file changed

+7
-17
lines changed

ci_build.sh

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,27 @@ LC_ALL=C
1010
export LANG LC_ALL
1111

1212
# Location of releases
13+
set +e
1314
GIT_DESCRIBE=$(git describe --tags --abbrev=10)
15+
if [ $? -ne 0 ]; then
16+
GIT_DESCRIBE=devel
17+
fi
18+
set -e
1419

1520
# Declare all combinations for deploy all
1621
# Note that the key is the name of the release object
1722
declare -A BUILDS
1823
BUILDS[afc-bpm-3.0-${GIT_DESCRIBE}]="\
19-
-DBOARD=afc-bpm \
20-
-DVERSION=3.0 \
21-
-DBOARD_RTM= \
22-
-DCMAKE_BUILD_TYPE=Release"
23-
BUILDS[afc-bpm-3.1-${GIT_DESCRIBE}]="\
24-
-DBOARD=afc-bpm \
25-
-DVERSION=3.1 \
26-
-DBOARD_RTM= \
27-
-DCMAKE_BUILD_TYPE=Release"
28-
BUILDS[afc-timing-${GIT_DESCRIBE}]="\
29-
-DBOARD=afc-timing \
30-
-DVERSION= \
31-
-DBOARD_RTM=rtm-8sfp \
32-
-DCMAKE_BUILD_TYPE=Release"
33-
BUILDS[debug-afc-bpm-3.0-${GIT_DESCRIBE}]="\
3424
-DBOARD=afc-bpm \
3525
-DVERSION=3.0 \
3626
-DBOARD_RTM= \
3727
-DCMAKE_BUILD_TYPE=RelWithDebInfo"
38-
BUILDS[debug-afc-bpm-3.1-${GIT_DESCRIBE}]="\
28+
BUILDS[afc-bpm-3.1-${GIT_DESCRIBE}]="\
3929
-DBOARD=afc-bpm \
4030
-DVERSION=3.1 \
4131
-DBOARD_RTM= \
4232
-DCMAKE_BUILD_TYPE=RelWithDebInfo"
43-
BUILDS[debug-afc-timing-${GIT_DESCRIBE}]="\
33+
BUILDS[afc-timing-${GIT_DESCRIBE}]="\
4434
-DBOARD=afc-timing \
4535
-DVERSION= \
4636
-DBOARD_RTM=rtm-8sfp \

0 commit comments

Comments
 (0)