Skip to content

Commit

Permalink
Merge 9002784 into 239b7d3
Browse files Browse the repository at this point in the history
  • Loading branch information
IanButterworth committed May 6, 2020
2 parents 239b7d3 + 9002784 commit 4185588
Show file tree
Hide file tree
Showing 13 changed files with 67 additions and 164 deletions.
17 changes: 0 additions & 17 deletions .cirrus.yml

This file was deleted.

24 changes: 24 additions & 0 deletions .drone.jsonnet
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
local Pipeline(os, arch, version) = {
kind: "pipeline",
name: os+" - "+arch+" - Julia "+version,
platform: {
os: os,
arch: arch
},
steps: [
{
name: "build",
image: "julia:"+version,
commands: [
"julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"
]
}
]
};

[
Pipeline("linux", "arm", "1.0"),
Pipeline("linux", "arm", "1.4"),
Pipeline("linux", "arm64", "1.0"),
Pipeline("linux", "arm64", "1.4")
]
50 changes: 23 additions & 27 deletions .drone.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
kind: pipeline
name: linux-arm-1.0
name: linux - arm - Julia 1.0

platform:
os: linux
Expand All @@ -9,29 +10,25 @@ steps:
- name: build
image: julia:1.0
commands:
- uname -a
- julia --project=. -e 'using Pkg; Pkg.build(); Pkg.test(coverage=true)'

#---
#
#kind: pipeline
#name: linux-arm-1.1
#
#platform:
# os: linux
# arch: arm
#
#steps:
#- name: build
# image: julia:1.1
# commands:
# - uname -a
# - julia --project=. -e 'using Pkg; Pkg.build(); Pkg.test(coverage=true)'
- "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"

---
kind: pipeline
name: linux - arm - Julia 1.4

platform:
os: linux
arch: arm

steps:
- name: build
image: julia:1.4
commands:
- "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"

---
kind: pipeline
name: linux-aarch64-1.0
name: linux - arm64 - Julia 1.0

platform:
os: linux
Expand All @@ -41,21 +38,20 @@ steps:
- name: build
image: julia:1.0
commands:
- uname -a
- julia --project=. -e 'using Pkg; Pkg.build(); Pkg.test(coverage=true)'
- "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"

---

kind: pipeline
name: linux-aarch64-1.1
name: linux - arm64 - Julia 1.4

platform:
os: linux
arch: arm64

steps:
- name: build
image: julia:1.1
image: julia:1.4
commands:
- uname -a
- julia --project=. -e 'using Pkg; Pkg.build(); Pkg.test(coverage=true)'
- "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"

...
42 changes: 0 additions & 42 deletions .github/workflows/SnoopCompile.yml

This file was deleted.

15 changes: 13 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,28 @@ sudo: false
os:
- linux
- osx
- freebsd
julia:
- 1.0
- 1.1
- 1.2
- 1.4
- nightly
matrix:
allow_failures:
- julia: nightly
notifications:
email: false

branches:
only:
- master
- gh-pages # For building documentation
- /^testing-.*$/ # testing branches
- /^v[0-9]+\.[0-9]+\.[0-9]+$/ # version tags

cache:
directories:
- $HOME/.julia/artifacts

after_success:
# push coverage results to Coveralls and Codecov
- julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())'
Expand Down
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ julia = "0.7, 1.0"

[extras]
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
ImageIO = "82e4d734-157c-48bb-816b-45c225c6df19"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["FileIO", "ImageMagick", "Statistics", "StatsBase", "Test"]
test = ["FileIO", "ImageIO", "Statistics", "StatsBase", "Test"]
6 changes: 4 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
environment:
matrix:
- julia_version: 1.0
- julia_version: 1.1
- julia_version: 1.2
- julia_version: 1.4
- julia_version: latest

platform:
Expand All @@ -20,6 +19,9 @@ branches:
- master
- /release-.*/

cache:
- '%USERPROFILE%\.julia\artifacts'

notifications:
- provider: Email
on_build_success: false
Expand Down
55 changes: 0 additions & 55 deletions deps/SnoopCompile/precompile/precompile_VideoIO.jl

This file was deleted.

3 changes: 0 additions & 3 deletions deps/SnoopCompile/snoopBenchmark.jl

This file was deleted.

4 changes: 0 additions & 4 deletions deps/SnoopCompile/snoopCompile.jl

This file was deleted.

3 changes: 0 additions & 3 deletions src/VideoIO.jl
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,4 @@ function __init__()
end
end

include("../deps/SnoopCompile/precompile/precompile_VideoIO.jl")
_precompile_()

end # VideoIO
6 changes: 0 additions & 6 deletions test/Project.toml

This file was deleted.

2 changes: 1 addition & 1 deletion test/avio.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Test
using ColorTypes: RGB, Gray, N0f8
using FileIO, ImageCore, ImageMagick, Dates, Statistics
using FileIO, ImageCore, Dates, Statistics
using Statistics, StatsBase

import VideoIO
Expand Down

0 comments on commit 4185588

Please sign in to comment.