You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by GitBox <gi...@apache.org> on 2018/08/13 21:10:39 UTC
[GitHub] nswamy closed pull request #12148: Fix RAT license checker which is
broken in trunk
nswamy closed pull request #12148: Fix RAT license checker which is broken in trunk
URL: https://github.com/apache/incubator-mxnet/pull/12148
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/Jenkinsfile b/Jenkinsfile
index 003e79c4c06..6eaee43df04 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -926,7 +926,7 @@ core_logic: {
timeout(time: max_time, unit: 'MINUTES') {
utils.init_git()
utils.docker_run('ubuntu_cpu', 'deploy_docs', false)
- sh "tests/ci_build/deploy/ci_deploy_doc.sh ${env.BRANCH_NAME} ${env.BUILD_NUMBER}"
+ sh "ci/other/ci_deploy_doc.sh ${env.BRANCH_NAME} ${env.BUILD_NUMBER}"
}
}
}
diff --git a/Makefile b/Makefile
index 6e935673630..7aa7867f7c1 100644
--- a/Makefile
+++ b/Makefile
@@ -534,7 +534,7 @@ cpplint:
--exclude_path src/operator/contrib/ctc_include
pylint:
- pylint --rcfile=$(ROOTDIR)/tests/ci_build/pylintrc --ignore-patterns=".*\.so$$,.*\.dll$$,.*\.dylib$$" python/mxnet tools/caffe_converter/*.py
+ pylint --rcfile=$(ROOTDIR)/ci/other/pylintrc --ignore-patterns=".*\.so$$,.*\.dll$$,.*\.dylib$$" python/mxnet tools/caffe_converter/*.py
doc: docs
diff --git a/ci/docker/install/ubuntu_rat.sh b/ci/docker/install/ubuntu_rat.sh
index 94596ef011f..b131a0bb558 100755
--- a/ci/docker/install/ubuntu_rat.sh
+++ b/ci/docker/install/ubuntu_rat.sh
@@ -24,10 +24,11 @@ apt-get update
apt-get install -y subversion maven openjdk-8-jdk openjdk-8-jre
echo "download RAT"
-svn co http://svn.apache.org/repos/asf/creadur/rat/trunk/
+#svn co http://svn.apache.org/repos/asf/creadur/rat/trunk/
+svn co http://svn.apache.org/repos/asf/creadur/rat/branches/0.12-release/
echo "cd into directory"
-cd trunk
+cd 0.12-release
echo "mvn install"
mvn -Dmaven.test.skip=true install
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 2a813c833e0..bbcffe68bb0 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -869,7 +869,7 @@ nightly_test_rat_check() {
set -e
pushd .
- cd /work/deps/trunk/apache-rat/target
+ cd /work/deps/0.12-release/apache-rat/target
# Use shell number 5 to duplicate the log output. It get sprinted and stored in $OUTPUT at the same time https://stackoverflow.com/a/12451419
exec 5>&1
diff --git a/tests/ci_build/deploy/ci_deploy_doc.sh b/ci/other/ci_deploy_doc.sh
similarity index 100%
rename from tests/ci_build/deploy/ci_deploy_doc.sh
rename to ci/other/ci_deploy_doc.sh
diff --git a/tests/ci_build/pylintrc b/ci/other/pylintrc
similarity index 100%
rename from tests/ci_build/pylintrc
rename to ci/other/pylintrc
diff --git a/tests/ci_build/pip_tests/Dockerfile.in.pip_cpu b/tests/ci_build/pip_tests/Dockerfile.in.pip_cpu
deleted file mode 100644
index de4629fab2e..00000000000
--- a/tests/ci_build/pip_tests/Dockerfile.in.pip_cpu
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: dockerfile -*-
-# dockerfile to test pip installation on CPU
-
-FROM ubuntu:16.04
diff --git a/tests/ci_build/pip_tests/Dockerfile.in.pip_cu75 b/tests/ci_build/pip_tests/Dockerfile.in.pip_cu75
deleted file mode 100644
index a41e6a95330..00000000000
--- a/tests/ci_build/pip_tests/Dockerfile.in.pip_cu75
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: dockerfile -*-
-# dockerfile to test pip installation on GPU with CUDA 7.5 CuDNN 5.1
-
-FROM nvidia/cuda:7.5-cudnn5-devel
diff --git a/tests/ci_build/pip_tests/Dockerfile.in.pip_cu80 b/tests/ci_build/pip_tests/Dockerfile.in.pip_cu80
deleted file mode 100644
index 714ba3cf325..00000000000
--- a/tests/ci_build/pip_tests/Dockerfile.in.pip_cu80
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: dockerfile -*-
-# dockerfile to test pip installation on GPU with CUDA 8.0 CuDNN 5.1
-
-FROM nvidia/cuda:8.0-cudnn5-devel
diff --git a/tests/ci_build/pip_tests/Dockerfile.pip_dependencies b/tests/ci_build/pip_tests/Dockerfile.pip_dependencies
deleted file mode 100644
index 0698633ac57..00000000000
--- a/tests/ci_build/pip_tests/Dockerfile.pip_dependencies
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- mode: dockerfile -*-
-# part of the dockerfile to test pip installations
-
-# add repo to install different Python versions
-RUN apt-get update && apt-get install -y software-properties-common
-RUN add-apt-repository ppa:deadsnakes/ppa && apt-get update
-RUN apt-get install -y python python2.7 python3.4 python3.5 python3.6
-
-# install other dependencies
-RUN apt-get install -y wget git unzip gcc
-RUN apt-get install -y libgfortran3
-
-# install virtualenv
-RUN wget https://bootstrap.pypa.io/get-pip.py && python get-pip.py && pip install virtualenv && rm -rf get-pip.py
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services