Skip to content

Commit

Permalink
Update REQUIRE and use Pkg3 on v0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
ScottPJones committed Jun 6, 2018
1 parent dfb67a3 commit 9aeb35d
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ matrix:
# - if [ $TRAVIS_OS_NAME = osx ]; then brew install gcc; fi

## uncomment the following lines to override the default test script
#script:
# - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
# - julia -e 'mit="ModuleInterfaceTools"; mh3="MurmurHash3"; loc="https://github.com/JuliaString"; if VERSION < v"0.7.0-DEV.5183"; cln = Pkg.clone; cln("$loc/$mit.jl"); cln("$loc/$mh3.jl"); for n in ("StrAPI", "CharSetEncodings", "ChrBase"); Pkg.add(n); end; cln("$loc/StrBase.jl"); cln(pwd()); else; using Pkg; cln = Pkg.add; cln("$loc/StrBase.jl"); end; Pkg.build("StrICU"); Pkg.test("StrICU"; coverage=true)'
script:
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- julia -e 'mit="if VERSION < v"0.7.0-DEV.5183"; Pkg.clone(pwd()); else; using Pkg; Pkg.up(); Pkg.add(pwd()); end; Pkg.build("StrICU"); Pkg.test("StrICU"; coverage=true)'
after_success:
# push coverage results to Coveralls
- julia -e 'cd(Pkg.dir("StrICU")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
- julia -e 'VERSION < v"0.7.0-DEV" || (using Pkg); cd(Pkg.dir("StrICU")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
# push coverage results to Codecov
- julia -e 'cd(Pkg.dir("StrICU")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
- julia -e 'VERSION < v"0.7.0-DEV" || (using Pkg); cd(Pkg.dir("StrICU")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
File renamed without changes.
7 changes: 6 additions & 1 deletion REQUIRE
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
julia 0.6
BinDeps
StrBase
ModuleInterfaceTools 0.1.2
StrAPI 0.1.1
CharSetEncodings 0.1.1
ChrBase 0.1.1
MurmurHash3 0.1.2
StrBase 0.1.1
@windows WinRPM
5 changes: 3 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ build_script:
- IF EXIST .git\shallow (git fetch --unshallow)
- C:\projects\julia\bin\julia -e "VERSION < v\"0.7.0-DEV\" || (using InteractiveUtils);
versioninfo(); pkg = \"StrICU\";
if VERSION < v\"0.7.0-DEV.5183\"; Pkg.clone(pwd(), pkg); else; using Pkg; end;
if VERSION < v\"0.7.0-DEV.5183\"; Pkg.clone(pwd(), pkg);
else; using Pkg; Pkg.up(); Pkg.add(pwd()); end;
Pkg.build(pkg)"

test_script:
- C:\projects\julia\bin\julia -e "Pkg.test(\"StrICU\")"
- C:\projects\julia\bin\julia -e "VERSION < v\"0.7.0-DEV\" || (using Pkg); Pkg.test(\"StrICU\")"
2 changes: 2 additions & 0 deletions src/StrICU.jl
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ module StrICU

using ModuleInterfaceTools

@static V6_COMPAT || (using Pkg)

@api extend StrAPI, CharSetEncodings, ChrBase, StrBase

@static if !V6_COMPAT
Expand Down

0 comments on commit 9aeb35d

Please sign in to comment.