Skip to content

Commit defdba0

Browse files
authored
Merge pull request #19 from JuliaComputing/jb/testversions
update versions to test on
2 parents 5fdd1a0 + 1cc7654 commit defdba0

File tree

3 files changed

+14
-18
lines changed

3 files changed

+14
-18
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ os:
44
- linux
55
- osx
66
julia:
7-
- 0.7-
7+
- 0.7
8+
- 1.0
89
- nightly
910
notifications:
1011
email: false

appveyor.yml

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
environment:
22
matrix:
3-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.7/julia-0.7-latest-win32.exe"
4-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe"
5-
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
6-
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
3+
- julia_version: 0.7
4+
- julia_version: 1.0
5+
- julia_version: latest
6+
7+
platform:
8+
- x86 # 32-bit
9+
- x64 # 64-bit
710

811
branches:
912
only:
@@ -17,19 +20,11 @@ notifications:
1720
on_build_status_changed: false
1821

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

2825
build_script:
29-
# Need to convert from shallow to complete for Pkg.clone to work
30-
- IF EXIST .git\shallow (git fetch --unshallow)
31-
- C:\projects\julia\bin\julia -e "versioninfo();
32-
Pkg.clone(pwd(), \"MemPool\"); Pkg.build(\"MemPool\")"
26+
- echo "%JL_BUILD_SCRIPT%"
27+
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
3328

3429
test_script:
35-
- C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"MemPool\")"
30+
- C:\julia\bin\julia --check-bounds=yes -e "using Pkg; Pkg.test(\"MemPool\")"

src/MemPool.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ end
7070

7171
function approx_size(d::AbstractArray{T}) where T
7272
isempty(d) && return 0
73-
isbits(T) && return sizeof(d)
73+
isbitstype(T) && return sizeof(d)
7474
approx_size(T, length(d), d)
7575
end
7676

0 commit comments

Comments
 (0)