Skip to content

Commit

Permalink
Upgrade to 0.7/1.0 (#79)
Browse files Browse the repository at this point in the history
* Removed precompile and deprecated call to Base.BLAS

* Upgrade Travis & Appveyor to 0.7/1.0
  • Loading branch information
DrDaleks authored and ararslan committed Aug 11, 2018
1 parent db020d6 commit 7e3fdc9
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 24 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ os:
- linux
- osx
julia:
- 0.7
- 1.0
- nightly
env:
matrix:
Expand All @@ -16,5 +18,5 @@ notifications:
# - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
# - julia -e 'Pkg.clone(pwd()); Pkg.build("FFTW"); Pkg.test("FFTW"; coverage=true)'
after_success:
- julia -e 'Pkg.add("Coverage"); cd(Pkg.dir("FFTW")); using Coverage; Coveralls.submit(Coveralls.process_folder())'
- julia -e 'Pkg.add("Documenter"); cd(Pkg.dir("FFTW")); include(joinpath("docs", "make.jl"))'
- julia -e 'using Pkg; Pkg.add("Coverage"); Pkg.dir("FFTW"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
- julia -e 'using Pkg; Pkg.add("Documenter"); Pkg.dir("FFTW"); include(joinpath("docs", "make.jl"))'
44 changes: 25 additions & 19 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
environment:
matrix:
- 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: 1
- julia_version: nightly

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-.*/

notifications:
- provider: Email
Expand All @@ -14,24 +26,18 @@ notifications:
on_build_status_changed: false

install:
- ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
# If there's a newer build queued for the same PR, cancel this one
- ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
throw "There are newer queued builds for this pull request, failing early." }
# 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(), \"FFTW\"); Pkg.build(\"FFTW\")"
- 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(\"FFTW\")"
- echo "%JL_TEST_SCRIPT%"
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"

# # Uncomment to support code coverage upload. Should only be enabled for packages
# # which would have coverage gaps without running on Windows
# on_success:
# - echo "%JL_CODECOV_SCRIPT%"
# - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"
4 changes: 3 additions & 1 deletion deps/build.jl
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
using LinearAlgebra

import Libdl
const depsfile = joinpath(@__DIR__, "deps.jl")

Expand All @@ -15,7 +17,7 @@ else
open(f -> println(f, provider), settings, "w")
end
if provider == "MKL"
if Base.BLAS.vendor() === :mkl
if BLAS.vendor() === :mkl
mklpath = Libdl.dlpath("libmkl_rt")
else
using Conda
Expand Down
2 changes: 0 additions & 2 deletions src/FFTW.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
__precompile__()

module FFTW

using Compat, LinearAlgebra, Reexport
Expand Down

0 comments on commit 7e3fdc9

Please sign in to comment.