Skip to content

Commit

Permalink
Merge pull request #159 from JuliaWeb/davidanthoff-julia-0.7
Browse files Browse the repository at this point in the history
Davidanthoff julia 0.7
  • Loading branch information
quinnj committed Aug 7, 2018
2 parents 9a88bf0 + d1aa6d2 commit 4911ba3
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 26 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ deps/downloads
deps/src
deps/deps.jl
deps/usr
deps/build.log
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ os:
- linux
- osx
julia:
- 0.6
- 0.7
- nightly
notifications:
email: false
script:
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- julia -e 'Pkg.clone(pwd()); Pkg.build("MbedTLS")'
- julia -e 'Pkg.test("MbedTLS", coverage=true)'
- julia -e 'using Pkg; Pkg.clone(pwd()); Pkg.build("MbedTLS")'
- julia -e 'using Pkg; Pkg.test("MbedTLS", coverage=true)'
after_success:
- julia -e 'cd(Pkg.dir("MbedTLS")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'
- julia -e 'cd(using Pkg; Pkg.dir("MbedTLS")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'
2 changes: 1 addition & 1 deletion REQUIRE
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
julia 0.6
julia 0.7
BinaryProvider
Compat 0.52.0
34 changes: 17 additions & 17 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
environment:
matrix:
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
- 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"
- julia_version: 0.7
- julia_version: latest

platform:
- x86 # 32-bit
- x64 # 64-bit

## uncomment the following lines to allow failures on nightly julia
## (tests will run but not make your overall status red)
#matrix:
# allow_failures:
# - julia_version: latest

branches:
only:
- master
- /release-.*/
- windows

notifications:
- provider: Email
Expand All @@ -18,19 +25,12 @@ notifications:
on_build_status_changed: false

install:
- ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
# Download most recent Julia Windows binary
- ps: (new-object net.webclient).DownloadFile(
$env:JULIA_URL,
"C:\projects\julia-binary.exe")
# Run installer silently, output to C:\projects\julia
- C:\projects\julia-binary.exe /S /D=C:\projects\julia
- ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))

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 "versioninfo();
Pkg.clone(pwd(), \"MbedTLS\"); Pkg.build(\"MbedTLS\")"
- echo "%JL_BUILD_SCRIPT%"
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"

test_script:
- C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"MbedTLS\")"
- echo "%JL_TEST_SCRIPT%"
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
2 changes: 1 addition & 1 deletion src/md.jl
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ function _write(ctx::MD{true}, buf, size)
end

function Base.write(ctx::MD, buf::Vector)
isbits(eltype(buf)) || error("Expected a vector of bits types got $(typeof(buf))")
isbitstype(eltype(buf)) || error("Expected a vector of bits types got $(typeof(buf))")
_write(ctx, buf, sizeof(buf))
end
# To avoid ambiguity warnings
Expand Down
2 changes: 1 addition & 1 deletion src/rsa.jl
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ end

function mpi_import!(mpi::Ptr{mbedtls_mpi}, b::BigInt)
# Export from GMP
size = ndigits(b, 2)
size = ndigits(b, base=2)
nbytes = div(size+8-1,8)
data = Vector{UInt8}(undef, nbytes)
count = Ref{Csize_t}(0)
Expand Down
4 changes: 2 additions & 2 deletions src/ssl.jl
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ function handshake(ctx::SSLContext)
try
wait(ctx.bio.readnotify)
catch e
if e isa Base.UVError
# Ignore read errors (UVError ECONNRESET)
if e isa Base.IOError
# Ignore read errors (IOError ECONNRESET)
# https://github.com/JuliaWeb/MbedTLS.jl/issues/148
else
rethrow(e)
Expand Down

0 comments on commit 4911ba3

Please sign in to comment.