From 7d34b9bb46123499439d0e6eea305b40de849e61 Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Mon, 30 Mar 2020 11:39:01 +0200 Subject: [PATCH 1/2] fix julia versions in tests --- .travis.yml | 2 +- appveyor.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index abf00122..60b5bbde 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,8 @@ os: - linux # - osx julia: + - 1.0 - 1 - - 1.4 - nightly matrix: diff --git a/appveyor.yml b/appveyor.yml index 7742efb2..911fe8f4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,7 @@ environment: matrix: - # - julia_version: 0.7 + - julia_version: 1.0 - julia_version: 1 - - julia_version: 1.4 - julia_version: nightly platform: From f1f9d807e625494089be3458bc812d2c729c45d1 Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Mon, 30 Mar 2020 11:39:50 +0200 Subject: [PATCH 2/2] don't pin FixedPointNumbers in tests --- .travis.yml | 2 +- appveyor.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 60b5bbde..ccd58dfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,4 +41,4 @@ after_success: script: - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi - if [[ `uname` = "Linux" ]]; then TESTCMD="xvfb-run julia"; else TESTCMD="julia"; fi - - $TESTCMD -e 'using Pkg; if VERSION == v"1.4"; Pkg.resolve(); end; Pkg.pin(PackageSpec(name="FixedPointNumbers", version="0.7")); Pkg.build(); Pkg.test(coverage=true)' + - $TESTCMD -e 'using Pkg; Pkg.build(); Pkg.test(coverage=true)' diff --git a/appveyor.yml b/appveyor.yml index 911fe8f4..081e56df 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -32,8 +32,7 @@ install: - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1")) build_script: - - C:\julia\bin\julia --project=C:\projects\plots-jl -e "using Pkg; if VERSION == v"""1.4"""; Pkg.resolve(); end; Pkg.pin(PackageSpec(name="""FixedPointNumbers""", version="""0.7"""))" - - echo "%JL_BUILD_SCRIPT%" + - echo "%JL_TEST_SCRIPT%" - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%" test_script: