Thanks for the review, Konstantin! On Mon, Feb 3, 2020 at 10:31 AM Konstantin Kolinko <knst.koli...@gmail.com> wrote:
> Where is the license header? > (maybe the yml file cannot have it, but a sh file must have it) > I've added the licence header to both files. If the one in the .yml file breaks Travis then I will revert it but I think it should be OK. > > Where are exclusion rules for Apache RAT checks? > (The configuration file is res/rat/rat-excludes.txt) > https://creadur.apache.org/rat/ Added them to ./res/rat/rat-excludes.txt ! > > > How these files are packaged in source distributions? > (LF <-> CRLF conversion shall be configured in build.xml) > I think those files are not needed in the source distribution. "ant dist-static" does not put them in output/dist/ at the moment. Same for "ant " - the files are not in output/release/vVERSION-dev/bin/apache-tomcat-VERSION-dev.tar.gz build.xml is also not copied in those. > > > пн, 3 февр. 2020 г. в 09:45, <mgrigo...@apache.org>: > > > > This is an automated email from the ASF dual-hosted git repository. > > > > mgrigorov pushed a commit to branch 9.0.x > > in repository https://gitbox.apache.org/repos/asf/tomcat.git > > > > > > The following commit(s) were added to refs/heads/9.0.x by this push: > > new 58a490b Test Tomcat on ARM64 at TravisCI > > 58a490b is described below > > > > commit 58a490bfa7429d33cd3437b8470569daa7d9be30 > > Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> > > AuthorDate: Thu Jan 23 11:53:22 2020 +0200 > > > > Test Tomcat on ARM64 at TravisCI > > > > (cherry picked from commit e6ebd2346850a14c3ff59a2372169a167958e024) > > --- > > .travis.yml | 67 > ++++++++++++++++++++++++++++++++++++++++++++++++++++++ > > .travis/antTest.sh | 8 +++++++ > > 2 files changed, 75 insertions(+) > > > > diff --git a/.travis.yml b/.travis.yml > > new file mode 100644 > > index 0000000..04a14c9 > > --- /dev/null > > +++ b/.travis.yml > > @@ -0,0 +1,67 @@ > > +dist: bionic > > +language: java > > +jdk: oraclejdk8 > > +arch: arm64 > > + > > +addons: > > + apt: > > + packages: > > + - ant > > + - build-essential > > + - automake > > + - autoconf > > + - tar > > + - libssl-dev > > + - subversion > > + - git > > + - libtool-bin > > + > > +install: > > + - ARCH=`uname -p` > > + - echo $ARCH > > + - JDK_X64=" > https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz > " > > + - JDK_ARM64=" > https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz > " > > + - if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; else > JDK_URL=$JDK_X64; fi > > + - wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz > > + - mv jdk8* jdk > > + - export JAVA_HOME=`pwd`/jdk > > + - wget -q > http://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.7-bin.tar.gz > && tar xzf apache-ant-*-bin.tar.gz > > + - export ANT_HOME=`pwd`/apache-ant-1.10.7 > > + - export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH" > > + - java -version > > + - ant -version > > + - rm -rf $HOME/tmp > > + - export CURR_PWD=`pwd` > > + - svn co -q > https://svn.apache.org/repos/asf/apr/apr/branches/1.6.x/ $HOME/tmp/apr > > + - cd $HOME/tmp/apr > > + - ./buildconf > > + - ./configure --prefix=$HOME/tmp/apr-build > > + - make > > + - make install > > + - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/tmp/apr-build/lib" > > + - git clone -q https://github.com/apache/tomcat-native.git > $HOME/tmp/tomcat-native > > + - cd $HOME/tmp/tomcat-native/native > > + - sh buildconf --with-apr=$HOME/tmp/apr > > + - ./configure --with-apr=$HOME/tmp/apr --with-java-home=$JAVA_HOME > --with-ssl=yes --prefix=$HOME/tmp/tomcat-native-build > > + - make > > + - make install > > + - cd $CURR_PWD > > + - yes | cp build.properties.default build.properties > > + - echo "test.threads=16" >> build.properties > > + - echo "test.relaxTiming=true" >> build.properties > > + - echo "test.excludePerformance=true" >> build.properties > > + - echo "test.openssl.path=/dev/null/openssl" >> build.properties > > + - echo "test.apr.loc=$HOME/tmp/tomcat-native-build/lib" >> > build.properties > > + > > + > > +script: > > + - ant -q clean > > + - travis_wait 60 "./.travis/antTest.sh" > > + > > +after_failure: > > + - tail -n 5000 ant-test.log > > + - ls -laR $HOME/tomcat-build-libs > > + > > +notifications: > > + email: > > + - dev@tomcat.apache.org > > \ No newline at end of file > > diff --git a/.travis/antTest.sh b/.travis/antTest.sh > > new file mode 100755 > > index 0000000..155004c > > --- /dev/null > > +++ b/.travis/antTest.sh > > @@ -0,0 +1,8 @@ > > +#!/usr/bin/env bash > > + > > +# A helper script for TravisCI builds that saves the std > > +# out and err streams in a log file. This is needed > > +# because otherwise TravisCI complains that there is too > > +# much logging on stdout > > + > > +ant -q test 2>&1 > ant-test.log > > > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > > For additional commands, e-mail: dev-h...@tomcat.apache.org > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
