Granular.jl

commit 1d1b4a3b8042899580175b70e5e99f4ae330db27
parent 48c4016fe75110a54780220b872c6d04cb709e70
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date:   Sun, 12 Aug 2018 19:30:35 +0200

Update appveyor build configuration

Diffstat:
M
Makefile
 | 
8
++++++--
M
appveyor.yml
 | 
21
++++++++++-----------

2 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
@@ -5,14 +5,18 @@ test: test-julia-1.0 #test-julia-0.6
 
 .PHONY: test-julia-0.6
 test-julia-0.6:
-	@#julia --color=yes -e 'Pkg.test("Granular")'
 	julia-0.6 --color=yes -e 'Pkg.test("Granular")' \
 		&& notify-send Granular.jl tests completed successfully on Julia 0.6 \
 		|| notify-send Granular.jl failed on Julia 0.6
 
+.PHONY: test-julia-0.7
+test-julia-0.7:
+	julia-0.7 --color=yes -e 'import Pkg; Pkg.test("Granular")' \
+		&& notify-send Granular.jl tests completed successfully on Julia 0.7 \
+		|| notify-send Granular.jl failed on Julia 0.7
+
 .PHONY: test-julia-1.0
 test-julia-1.0:
-	@#julia-1.0 --color=yes -e 'Pkg.test("Granular")'
 	julia-1.0 --color=yes -e 'import Pkg; Pkg.test("Granular")' \
 		&& notify-send Granular.jl tests completed successfully on Julia 1.0 \
 		|| notify-send Granular.jl failed on Julia 1.0
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,11 +1,7 @@
 environment:
   matrix:
-  - JULIAVERSION: "julialang/bin/winnt/x64/1.0/julia-1.0-latest-win64.exe"
-  - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
-
-matrix:
-  allow_failures:
-      - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/1.0/julia-1.0-latest-win64.exe"
+  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
 
 branches:
   only:
@@ -19,16 +15,19 @@ 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(
-        $("http://s3.amazonaws.com/"+$env:JULIAVERSION),
+        $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
 
-before_build:
-  - C:\projects\julia\bin\julia -e "versioninfo(); import Pkg; Pkg.add(\"NetCDF\")"
-
 build_script:
 # Need to convert from shallow to complete for Pkg.clone to work
   - IF EXIST .git\shallow (git fetch --unshallow)
@@ -36,4 +35,4 @@ build_script:
       import Pkg; Pkg.clone(pwd(), \"Granular\"); Pkg.build(\"Granular\")"
 
 test_script:
-  - C:\projects\julia\bin\julia -e "import Pkg; Pkg.test(\"Granular\")"
+  - C:\projects\julia\bin\julia -e "Pkg.test(\"Granular\")"