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:50 UTC
[drill] branch master updated (47acf50 -> 556b972)
This is an automated email from the ASF dual-hosted git repository.
dzamo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git.
from 47acf50 DRILL-8124: Fix implicit file issue with EVF 2 (#2451)
new e415c97 Fix line continuations in .travis.yml and update NOTICE.
new 0f1bc9b Revert .travis.yml to 80fa2662.
new 556b972 Set failOnNoFiles = false so that checksum-maven-plugin works on tools-parent.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 51 +++++++++++++++++++++++++--------------------------
NOTICE | 2 +-
pom.xml | 2 ++
3 files changed, 28 insertions(+), 27 deletions(-)
[drill] 02/03: Revert .travis.yml to 80fa2662.
Posted by dz...@apache.org.
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 0f1bc9b46ccb07d73cd8d59b11f8f16afee20e5a
Author: James Turton <ja...@somecomputer.xyz>
AuthorDate: Thu Feb 3 14:02:25 2022 +0200
Revert .travis.yml to 80fa2662.
---
.travis.yml | 70 +++++++++++++++++++++----------------------------------------
1 file changed, 24 insertions(+), 46 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 161b334..957accd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,63 +50,41 @@ before_install:
- git fetch --unshallow
# Install libraries required for protobuf generation
- |
- if [ $PHASE = "build_checkstyle_protobuf" ]; then
- sudo apt-get install -y libboost-all-dev libzookeeper-mt-dev libsasl2-dev cmake libcppunit-dev checkinstall &&
- pushd .. &&
- if [ -f $HOME/protobuf/protobuf_3.16.1* ]; then
- 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;
- fi &&
- sudo ldconfig && popd;
+ if [ $PHASE = "build_checkstyle_protobuf" ]; then \
+ sudo apt-get install -y libboost-all-dev libzookeeper-mt-dev libsasl2-dev cmake libcppunit-dev checkinstall && \
+ pushd .. && \
+ if [ -f $HOME/protobuf/protobuf_3.16.1* ]; then \
+ 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; \
+ fi && \
+ sudo ldconfig && popd; \
fi
install:
# For tests phase runs unit tests
# For protobuf phase: builds Drill project, performs license checkstyle goal and regenerates Java and C++ Protobuf files
- |
- if [ $PHASE = "tests" ]; then
- MAVEN_OPTS="-XX:+UseG1GC"
+ if [ $PHASE = "tests" ]; then \
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;
+ -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; \
fi
script:
# Checks whether project files weren't changed after regenerating protobufs
- |
- if [ "$(git status -s | grep -c "")" -gt 0 ]; then
+ if [ "$(git status -s | grep -c "")" -gt 0 ]; then \
echo "The following changes are found in files after regenerating protobufs (output may be used as a patch to apply):" >&2 &&
- echo "$(git diff --color)" &&
- exit 1;
+ echo "$(git diff --color)" && \
+ exit 1; \
else
echo "All checks are passed!";
fi
[drill] 01/03: Fix line continuations in .travis.yml and update NOTICE.
Posted by dz...@apache.org.
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/).
[drill] 03/03: Set failOnNoFiles = false so that checksum-maven-plugin works on tools-parent.
Posted by dz...@apache.org.
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 556b972560911c20691d5b5de6c656d22c59ce0b
Author: James Turton <ja...@somecomputer.xyz>
AuthorDate: Fri Feb 4 16:27:41 2022 +0200
Set failOnNoFiles = false so that checksum-maven-plugin works on tools-parent.
---
pom.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pom.xml b/pom.xml
index 272c21b..3a93bb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2140,6 +2140,8 @@
<algorithms>
<algorithm>SHA-512</algorithm>
</algorithms>
+ <!-- the module tools-parent has no files for checksumming -->
+ <failIfNoFiles>false</failIfNoFiles>
<fileSets>
<!--Override fileSet from the Apache Parent POM-->
<fileSet>