From 0371e2215afba97e6d983ea4fc37ee87a17b1cc3 Mon Sep 17 00:00:00 2001 From: Gnimuc Date: Sat, 9 Mar 2019 22:46:34 +0800 Subject: [PATCH] Bump Julia version and update CI --- .gitignore | 1 + .travis.yml | 73 ++++++++++------------------------------------------ Project.toml | 1 + REQUIRE | 3 ++- 4 files changed, 17 insertions(+), 61 deletions(-) diff --git a/.gitignore b/.gitignore index 1d1cadf8..07900ff6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ docs/build docs/site deps/build.log +Manifest.toml diff --git a/.travis.yml b/.travis.yml index 28a2025c..aad965d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,78 +1,31 @@ +# Documentation: http://docs.travis-ci.com/user/languages/julia/ language: julia + os: - linux - osx + julia: - - 0.7 - - 1.0 + - 1.1 - nightly + matrix: allow_failures: - julia: nightly - fast_finish: true + notifications: email: false -sudo: false -addons: - apt: - sources: - - ubuntu-toolchain-r-test - - george-edison55-precise-backports - packages: - - cmake - - cmake-data - - gcc-6 - - g++-6 - - binutils - - gfortran - - libblas-dev - - liblapack-dev - - libgmp-dev - - libmpfr-dev -cache: - directories: - - $TRAVIS_BUILD_DIR/deps/src - - $TRAVIS_BUILD_DIR/deps/build - - ~/usr -before_cache: - - rm $TRAVIS_BUILD_DIR/deps/build/bootstrap.o - - rm -rf $TRAVIS_BUILD_DIR/deps/usr -before_script: - - | - if [ "$TRAVIS_OS_NAME" = "linux" ]; then - export CXX="g++-6" CC="gcc-6" - export PATH="$HOME/usr/bin:$PATH" - else - export CXX="clang++" CC="clang" - fi - - | - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ ! -f $HOME/usr/bin/ld ]; then - wget https://ftp.gnu.org/gnu/binutils/binutils-2.27.tar.gz - tar xzf binutils-2.27.tar.gz - (cd binutils-2.27 && ./configure --prefix=$HOME/usr && make && make install) - fi - - mkdir -p $TRAVIS_BUILD_DIR/../Cxx-cache && cp -R $TRAVIS_BUILD_DIR $TRAVIS_BUILD_DIR/../Cxx-cache - - julia -e 'using InteractiveUtils; versioninfo()' -script: - - julia --project=. -e 'using Pkg; Pkg.instantiate()' - - mv $TRAVIS_BUILD_DIR/../Cxx-cache/deps/src $TRAVIS_BUILD_DIR/deps/src || true - - mv $TRAVIS_BUILD_DIR/../Cxx-cache/deps/build $TRAVIS_BUILD_DIR/deps/build || true - - | - if [ ! -f $HOME/early_abort ]; then - PREBUILT_CI_BINARIES=1 julia --project=. -e 'using Pkg; Pkg.build()' || false - fi - - | - if [ ! -f $HOME/early_abort ]; then - julia --project=. -e 'Pkg.test(coverage=true)' || false - fi -after_success: - - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())' + jobs: include: - stage: "Documentation" - julia: 1.0 + julia: 1.1 os: linux script: - - julia --project=docs/ -e 'using Pkg; Pkg.instantiate(); Pkg.develop(PackageSpec(path=pwd()))' + - julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); + Pkg.build(); Pkg.instantiate()' - julia --project=docs/ docs/make.jl after_success: skip + +after_success: + - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())' diff --git a/Project.toml b/Project.toml index 3fddd04a..fed9388f 100644 --- a/Project.toml +++ b/Project.toml @@ -2,6 +2,7 @@ name = "Cxx" uuid = "a0b5b9ef-44b7-5148-a2d1-f6db19f3c3d2" [deps] +BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232" Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb" REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" diff --git a/REQUIRE b/REQUIRE index 859ad461..a00ef2c0 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1 +1,2 @@ -julia 0.7 +julia 1.1 +BinaryProvider 0.3.0