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 <[email protected]> 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
