You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by dz...@apache.org on 2022/02/04 14:36:51 UTC
[drill] 01/03: Fix line continuations in .travis.yml and update NOTICE.
This is an automated email from the ASF dual-hosted git repository.
dzamo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
commit e415c9776adc5466f46d108cc76c0fbfe75d75a3
Author: James Turton <ja...@somecomputer.xyz>
AuthorDate: Thu Feb 3 12:35:30 2022 +0200
Fix line continuations in .travis.yml and update NOTICE.
---
.travis.yml | 43 ++++++++++++++++++++++++++++++++-----------
NOTICE | 2 +-
2 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 169cfa5..161b334 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,12 +57,15 @@ before_install:
sudo dpkg -i $HOME/protobuf/protobuf_3.16.1*;
else
wget https://github.com/protocolbuffers/protobuf/releases/download/v3.16.1/protobuf-java-3.16.1.zip &&
- unzip protobuf-java-3.16.1.zip && pushd protobuf-3.16.1 &&
- ./configure && sudo make && sudo checkinstall -y &&
- if [ ! -d $HOME/protobuf ]; then
- mkdir -p $HOME/protobuf;
- fi &&
- mv protobuf_3.16.1* $HOME/protobuf/ && popd;
+ unzip protobuf-java-3.16.1.zip &&
+ pushd protobuf-3.16.1 &&
+ ./configure &&
+ sudo make &&
+ sudo checkinstall -y &&
+ if [ ! -d $HOME/protobuf ]; then
+ mkdir -p $HOME/protobuf;
+ fi &&
+ mv protobuf_3.16.1* $HOME/protobuf/ && popd;
fi &&
sudo ldconfig && popd;
fi
@@ -72,12 +75,30 @@ install:
- |
if [ $PHASE = "tests" ]; then
MAVEN_OPTS="-XX:+UseG1GC"
- mvn install --batch-mode --no-transfer-progress
- -DexcludedGroups="org.apache.drill.categories.SlowTest,org.apache.drill.categories.UnlikelyTest,org.apache.drill.categories.SecurityTest";
+ mvn install --batch-mode --no-transfer-progress \
+ -DexcludedGroups="
+ org.apache.drill.categories.SlowTest,
+ org.apache.drill.categories.UnlikelyTest,
+ org.apache.drill.categories.SecurityTest
+ ";
elif [ $PHASE = "build_checkstyle_protobuf" ]; then
- MAVEN_OPTS="-Xms1G -Xmx1G" mvn install --no-transfer-progress -Drat.skip=false -Dlicense.skip=false --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true &&
- pushd protocol && mvn process-sources -P proto-compile && popd &&
- mkdir contrib/native/client/build && pushd contrib/native/client/build && /usr/bin/cmake -G "Unix Makefiles" .. && make cpProtobufs && popd;
+ MAVEN_OPTS="-Xms1G -Xmx1G" mvn install \
+ --no-transfer-progress \
+ -Drat.skip=false \
+ -Dlicense.skip=false \
+ --batch-mode \
+ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
+ -DskipTests=true \
+ -Dmaven.javadoc.skip=true \
+ -Dmaven.source.skip=true &&
+ pushd protocol &&
+ mvn process-sources -P proto-compile &&
+ popd &&
+ mkdir contrib/native/client/build &&
+ pushd contrib/native/client/build &&
+ /usr/bin/cmake -G "Unix Makefiles" .. &&
+ make cpProtobufs &&
+ popd;
fi
script:
# Checks whether project files weren't changed after regenerating protobufs
diff --git a/NOTICE b/NOTICE
index 7125415..ebaafb3 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Drill
-Copyright 2013-2021 The Apache Software Foundation
+Copyright 2013-2022 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).