Skip to content

Commit 9f43ead

Browse files
committed
Build script:
* Add support for Debian 13. * Do not attempt to use deprecated apt-key command, if not available.
1 parent 8256af8 commit 9f43ead

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

travis/script.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,8 @@ install_maven() {
202202
}
203203

204204
build_ubuntu() {
205-
if [ x"$1" = x'22.04' -o x"$1" = x'24.04' -o x"$1" = x'd12' ]; then
205+
if [ x"$1" = x'22.04' -o x"$1" = x'24.04' -o x"$1" = x'd12' \
206+
-o x"$1" = x'd13' ]; then
206207
MYDEPS=$DEPS_UBUNTU22
207208
elif [ x"$1" = x'14.04' -o x"$1" = x'16.04' ]; then
208209
MYDEPS=$DEPS_UBUNTU14_16
@@ -213,13 +214,16 @@ build_ubuntu() {
213214
$MYSUDO apt-get update
214215
$MYSUDO /bin/bash -c \
215216
"DEBIAN_FRONTEND='noninteractive' $APT_GET_CMD install -y gnupg"
216-
$MYSUDO apt-key update
217+
if which apt-key >/dev/null 2>&1; then
218+
$MYSUDO apt-key update
219+
fi
217220
$MYSUDO $APT_GET_CMD update
218221
$MYSUDO /bin/bash -c \
219222
"DEBIAN_FRONTEND='noninteractive' $APT_GET_CMD install -y $MYDEPS"
220223
if [ x"$1" = x'18.04' -o x"$1" = x'20.04' -o x"$1" = x'22.04' \
221224
-o x"$1" = x'24.04' \
222-
-o x"$1" = x'd10' -o x"$1" = x'd11' -o x"$1" = x'd12' ]; then
225+
-o x"$1" = x'd10' -o x"$1" = x'd11' -o x"$1" = x'd12' \
226+
-o x"$1" = x'd13' ]; then
223227
QFSHADOOP_VERSIONS=$MYQFSHADOOP_VERSIONS_UBUNTU1804
224228
fi
225229
if [ x"$1" = x'14.04' ]; then

0 commit comments

Comments
 (0)