Skip to content

Commit 462cb20

Browse files
Update: Images 0.25 and workflows (#102)
1 parent 1bc7795 commit 462cb20

File tree

5 files changed

+63
-43
lines changed

5 files changed

+63
-43
lines changed

.github/workflows/CI.yml

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
name: CI
22
on:
3-
pull_request:
43
push:
54
branches:
65
- master
76
tags: '*'
7+
pull_request:
8+
concurrency:
9+
# Skip intermediate builds: always.
10+
# Cancel intermediate builds: only if it is a pull request build.
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
813
jobs:
914
test:
1015
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
@@ -13,35 +18,47 @@ jobs:
1318
fail-fast: false
1419
matrix:
1520
version:
16-
- '1.0'
1721
- '1.6'
1822
- '1'
19-
# - 'nightly'
23+
# - 'nightly'
2024
os:
2125
- ubuntu-latest
22-
- macOS-latest
23-
- windows-latest
2426
arch:
2527
- x64
28+
include:
29+
- os: windows-latest
30+
version: '1'
31+
arch: x64
32+
- os: macOS-latest
33+
version: '1'
34+
arch: x64
2635
steps:
2736
- uses: actions/checkout@v2
2837
- uses: julia-actions/setup-julia@v1
2938
with:
3039
version: ${{ matrix.version }}
3140
arch: ${{ matrix.arch }}
32-
- uses: actions/cache@v1
33-
env:
34-
cache-name: cache-artifacts
35-
with:
36-
path: ~/.julia/artifacts
37-
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
38-
restore-keys: |
39-
${{ runner.os }}-test-${{ env.cache-name }}-
40-
${{ runner.os }}-test-
41-
${{ runner.os }}-
41+
- uses: julia-actions/cache@v1
4242
- uses: julia-actions/julia-buildpkg@v1
4343
- uses: julia-actions/julia-runtest@v1
4444
- uses: julia-actions/julia-processcoverage@v1
45-
- uses: codecov/codecov-action@v1
45+
- uses: codecov/codecov-action@v2
46+
with:
47+
files: lcov.info
48+
multithreads:
49+
name: Julia (threads) 1 - ubuntu-latest - x64 - ${{ github.event_name }}
50+
runs-on: ubuntu-latest
51+
steps:
52+
- uses: actions/checkout@v2
53+
- uses: julia-actions/setup-julia@v1
54+
with:
55+
version: '1'
56+
arch: 'x64'
57+
- uses: julia-actions/cache@v1
58+
- uses: julia-actions/julia-buildpkg@v1
59+
- name: run test
60+
run: julia --project --code-coverage -t4 -e 'using Pkg; Pkg.test()'
61+
- uses: julia-actions/julia-processcoverage@v1
62+
- uses: codecov/codecov-action@v2
4663
with:
47-
file: lcov.info
64+
files: lcov.info

.github/workflows/CompatHelper.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,16 @@
11
name: CompatHelper
2-
32
on:
43
schedule:
5-
- cron: '00 00 * * *'
4+
- cron: 0 0 * * *
65
workflow_dispatch:
7-
86
jobs:
97
CompatHelper:
10-
runs-on: ${{ matrix.os }}
11-
strategy:
12-
matrix:
13-
julia-version: [1.2.0]
14-
julia-arch: [x86]
15-
os: [ubuntu-latest]
8+
runs-on: ubuntu-latest
169
steps:
1710
- name: Pkg.add("CompatHelper")
1811
run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
1912
- name: CompatHelper.main()
2013
env:
2114
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
22-
COMPATHELPER_PRIV: ${{ secrets.TAGBOT }}
23-
run: julia -e 'using CompatHelper; CompatHelper.main()'
15+
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
16+
run: julia -e 'using CompatHelper; CompatHelper.main()'

.github/workflows/Documenter.yml

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,28 @@
1-
name: Documenter
1+
name: docs
22
on:
3-
push:
4-
branches: [master]
5-
tags: [v*]
6-
pull_request:
7-
3+
- push
4+
- pull_request
85
jobs:
9-
Documenter:
6+
docs:
107
name: Documentation
118
runs-on: ubuntu-latest
129
steps:
1310
- uses: actions/checkout@v2
14-
- uses: julia-actions/julia-buildpkg@latest
15-
- uses: julia-actions/julia-docdeploy@latest
11+
- uses: julia-actions/setup-julia@v1
12+
with:
13+
version: '1'
14+
- run: |
15+
julia --project=docs -e '
16+
using Pkg
17+
Pkg.develop(PackageSpec(path=pwd()))
18+
Pkg.instantiate()'
19+
- run: |
20+
julia --project=docs -e '
21+
using Documenter: DocMeta, doctest
22+
using ImageFeatures
23+
DocMeta.setdocmeta!(ImageFeatures, :DocTestSetup, :(using ImageFeatures); recursive=true)
24+
doctest(ImageFeatures)'
25+
- run: julia --project=docs docs/make.jl
1626
env:
17-
GITHUB_TOKEN: \${{ secrets.GITHUB_TOKEN }}
18-
DOCUMENTER_KEY: \${{ secrets.DOCUMENTER_KEY }}
27+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
28+
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}

.github/workflows/TagBot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ jobs:
1212
- uses: JuliaRegistries/TagBot@v1
1313
with:
1414
token: ${{ secrets.GITHUB_TOKEN }}
15-
ssh: ${{ secrets.TAGBOT }}
15+
ssh: ${{ secrets.DOCUMENTER_KEY }}

Project.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "ImageFeatures"
22
uuid = "92ff4b2b-8094-53d3-b29d-97f740f06cef"
3-
version = "0.4.6"
3+
version = "0.5.0"
44

55
[deps]
66
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
@@ -10,8 +10,8 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
1010

1111
[compat]
1212
Distributions = "0.16, 0.17, 0.18, 0.19, 0.20, 0.21, 0.22, 0.23, 0.24, 0.25"
13-
Images = "0.18, 0.19, 0.20, 0.21, 0.22, 0.23, 0.24"
14-
julia = "1"
13+
Images = "0.18, 0.19, 0.20, 0.21, 0.22, 0.23, 0.24, 0.25"
14+
julia = "1.6"
1515

1616
[extras]
1717
ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"

0 commit comments

Comments
 (0)