diff --git a/.travis.yml b/.travis.yml index d7fba73..b96f717 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,9 +13,9 @@ git: ## uncomment the following lines to allow failures on nightly julia ## (tests will run but not make your overall status red) -matrix: - allow_failures: - - julia: nightly +#matrix: +# allow_failures: +# - julia: nightly ## uncomment and modify the following lines to manually install system packages #addons: @@ -27,10 +27,8 @@ matrix: ## uncomment the following lines to override the default test script script: - - julia -e 'if VERSION < v"0.7.0-DEV.5183"; Pkg.clone("https://github.com/JuliaString/StrAPI.jl"); Pkg.clone(pwd()); else; import Pkg; Pkg.up(); end; Pkg.test("CharSetEncodings"; coverage=true)' + - julia -e 'st="https://github.com/JuliaString/StrAPI.jl"; if VERSION < v"0.7.0-DEV.5183"; Pkg.clone(st); Pkg.clone(pwd()); else; import Pkg; Pkg.add(st); Pkg.add(pwd()); end; Pkg.test("CharSetEncodings"; coverage=true)' after_success: - # push coverage results to Coveralls - - julia -e 'VERSION < v"0.7.0-DEV" || (using Pkg); cd(Pkg.dir("CharSetEncodings")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())' - # push coverage results to Codecov - - julia -e 'VERSION < v"0.7.0-DEV" || (using Pkg); cd(Pkg.dir("CharSetEncodings")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())' + # push coverage results to Coveralls & Codecov + - julia -e 'VERSION < v"0.7.0-DEV" || (using Pkg); cd(Pkg.dir("CharSetEncodings")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder()); Codecov.submit(Codecov.process_folder())' diff --git a/appveyor.yml b/appveyor.yml index 268c172..895f53d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,10 +7,10 @@ environment: ## uncomment the following lines to allow failures on nightly julia ## (tests will run but not make your overall status red) -matrix: - allow_failures: - - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe" - - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe" +#matrix: +# allow_failures: +# - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe" +# - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe" branches: only: @@ -41,11 +41,11 @@ build_script: # Need to convert from shallow to complete for Pkg.clone to work - IF EXIST .git\shallow (git fetch --unshallow) - C:\projects\julia\bin\julia -e "VERSION < v\"0.7.0-DEV\" || (using InteractiveUtils, Pkg); - versioninfo(); + versioninfo(); st=\"https://github.com/JuliaString/StrAPI.jl\"; if VERSION < v\"0.7.0-DEV.5183\"; - Pkg.clone(\"https://github.com/JuliaString/StrAPI.jl\", \"StrAPI\"); + Pkg.clone(st, \"StrAPI\"); Pkg.clone(pwd(), \"CharSetEncodings\"); - else; Pkg.up(); end" + else; Pkg.add(st); Pkg.add(pwd()); end" test_script: - C:\projects\julia\bin\julia -e "VERSION < v\"0.7.0-DEV\" || (using Pkg); Pkg.test(\"CharSetEncodings\")"