Skip to content

Commit 7ec8ef9

Browse files
authored
Merge pull request #19 from JuliaImageRecon/yml
Update compat and yml files
2 parents 5746ab6 + 4644bd2 commit 7ec8ef9

File tree

12 files changed

+90
-83
lines changed

12 files changed

+90
-83
lines changed

.github/workflows/CI.yml

Lines changed: 0 additions & 55 deletions
This file was deleted.

.github/workflows/CompatHelper.yml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: CompatHelper
2+
23
on:
34
schedule:
45
- cron: 0 0 * * 0 # weekly
@@ -8,13 +9,25 @@ jobs:
89
CompatHelper:
910
runs-on: ubuntu-latest
1011
steps:
11-
- name: Pkg.add("CompatHelper")
12-
run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
13-
- name: CompatHelper.main()
12+
- name: "Add the General registry via Git"
13+
run: |
14+
import Pkg
15+
ENV["JULIA_PKG_SERVER"] = ""
16+
Pkg.Registry.add("General")
17+
shell: julia --color=yes {0}
18+
- name: "Install CompatHelper"
19+
run: |
20+
import Pkg
21+
name = "CompatHelper"
22+
uuid = "aa819f21-2bde-4658-8897-bab36330d9b7"
23+
version = "3"
24+
Pkg.add(; name, uuid, version)
25+
shell: julia --color=yes {0}
26+
- name: "Run CompatHelper"
27+
run: |
28+
import CompatHelper
29+
CompatHelper.main()
30+
shell: julia --color=yes {0}
1431
env:
1532
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
16-
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }} # need ssh
17-
run: julia -e 'using CompatHelper; CompatHelper.main()'
18-
19-
# based on:
20-
# https://github.com/JuliaRegistries/CompatHelper.jl
33+
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}

.github/workflows/Documentation.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ name: Documentation
22

33
on:
44
pull_request:
5+
paths-ignore:
6+
- 'README.md'
57
push:
8+
paths-ignore:
9+
- 'README.md'
610
branches:
711
- 'main'
812
- 'release-'

.github/workflows/TagBot.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
name: TagBot
2+
23
on:
34
issue_comment:
45
types:
56
- created
67
workflow_dispatch:
8+
79
jobs:
810
TagBot:
911
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'

.github/workflows/ci.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: CI
2+
3+
on:
4+
create:
5+
tags:
6+
push:
7+
branches:
8+
- main
9+
paths-ignore:
10+
- '**.md'
11+
- 'docs/**'
12+
pull_request:
13+
paths-ignore:
14+
- '**.md'
15+
- 'docs/**'
16+
workflow_dispatch:
17+
18+
jobs:
19+
test:
20+
name: Julia ${{ matrix.version }} - ${{ matrix.os }}
21+
runs-on: ${{ matrix.os }}
22+
continue-on-error: ${{ matrix.version == 'nightly' }}
23+
strategy:
24+
fail-fast: false
25+
matrix:
26+
version: ['1.6', '1', 'nightly']
27+
os: [ubuntu-latest, windows-latest, macOS-latest]
28+
steps:
29+
- uses: actions/checkout@v2
30+
# - name: "Set up Julia"
31+
- uses: julia-actions/setup-julia@latest
32+
with:
33+
version: ${{ matrix.version }}
34+
# - name: "Unit Test"
35+
- uses: julia-actions/julia-buildpkg@latest
36+
- uses: julia-actions/julia-runtest@latest
37+
# - name: "Cover"
38+
- uses: julia-actions/julia-processcoverage@v1
39+
- uses: codecov/codecov-action@v1
40+
if: ${{ matrix.version == '1' && matrix.os == 'ubuntu-latest' }}
41+
with:
42+
file: lcov.info

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "ImageGeoms"
22
uuid = "9ee76f2b-840d-4475-b6d6-e485c9297852"
33
authors = ["Jeff Fessler <[email protected]>"]
4-
version = "0.5.0"
4+
version = "0.5.1"
55

66
[deps]
77
FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
@@ -10,6 +10,6 @@ Requires = "ae029012-a4dd-5104-9daa-d747884805df"
1010

1111
[compat]
1212
FillArrays = "0.12"
13-
LazyGrids = "0.2.0"
13+
LazyGrids = "0.2, 0.3"
1414
Requires = "1.3"
1515
julia = "1.6"

docs/Project.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[deps]
22
AxisArrays = "39de3d68-74b9-583c-8d2d-e117c070f3a9"
33
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
4+
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
45
Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
56
MIRTjim = "170b2178-6dee-4cb0-8729-b3e8b57834cc"
67
OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
@@ -9,6 +10,3 @@ Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
910
UnitfulRecipes = "42071c24-d89e-48dd-8a24-8a12d9b8861f"
1011

1112
[compat]
12-
Documenter = "0.27.3"
13-
Literate = "2"
14-
MIRTjim = "0.11"

docs/lit/examples/1-overview.jl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,7 @@ ig_over = oversample(ig, (2,2))
198198

199199
# This page was generated with the following version of Julia:
200200

201-
io = IOBuffer()
202-
versioninfo(io)
203-
split(String(take!(io)), '\n')
201+
io = IOBuffer(); versioninfo(io); split(String(take!(io)), '\n')
204202

205203

206204
# And with the following package versions

docs/lit/examples/2-mask.jl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,7 @@ embed!(array, core, ig.mask)
113113

114114
# This page was generated with the following version of Julia:
115115

116-
io = IOBuffer()
117-
versioninfo(io)
118-
split(String(take!(io)), '\n')
116+
io = IOBuffer(); versioninfo(io); split(String(take!(io)), '\n')
119117

120118

121119
# And with the following package versions

docs/make.jl

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
execute = isempty(ARGS) || ARGS[1] == "run"
22

3-
using ImageGeoms
3+
org, reps = :JuliaImageRecon, :ImageGeoms
4+
eval(:(using $reps))
45
using Documenter
56
using Literate
67

@@ -13,7 +14,7 @@ lit = joinpath(@__DIR__, "lit")
1314
src = joinpath(@__DIR__, "src")
1415
gen = joinpath(@__DIR__, "src/generated")
1516

16-
base = "JuliaImageRecon/ImageGeoms.jl"
17+
base = "$org/$reps.jl"
1718
repo_root_url =
1819
"https://github.com/$base/blob/main/docs/lit/examples"
1920
nbviewer_root_url =
@@ -22,7 +23,8 @@ binder_root_url =
2223
"https://mybinder.org/v2/gh/$base/gh-pages?filepath=dev/generated/examples"
2324

2425

25-
DocMeta.setdocmeta!(ImageGeoms, :DocTestSetup, :(using ImageGeoms); recursive=true)
26+
repo = eval(:($reps))
27+
DocMeta.setdocmeta!(repo, :DocTestSetup, :(using $reps); recursive=true)
2628

2729
for (root, _, files) in walkdir(lit), file in files
2830
splitext(file)[2] == ".jl" || continue # process .jl files only
@@ -45,14 +47,14 @@ isci = get(ENV, "CI", nothing) == "true"
4547
format = Documenter.HTML(;
4648
prettyurls = isci,
4749
edit_link = "main",
48-
canonical = "https://JuliaImageRecon.github.io/ImageGeoms.jl/stable/",
49-
# assets = String[],
50+
canonical = "https://$org.github.io/$repo.jl/stable/",
51+
assets = ["assets/custom.css"],
5052
)
5153

5254
makedocs(;
53-
modules = [ImageGeoms],
55+
modules = [repo],
5456
authors = "Jeff Fessler and contributors",
55-
sitename = "ImageGeoms.jl",
57+
sitename = "$repo.jl",
5658
format,
5759
pages = [
5860
"Home" => "index.md",
@@ -69,6 +71,6 @@ if isci
6971
versions = ["stable" => "v^", "dev" => "dev"],
7072
forcepush = true,
7173
# push_preview = true,
72-
# see https://JuliaImageRecon.github.io/ImageGeoms.jl/previews/PR##
74+
# see https://$org.github.io/$repo.jl/previews/PR##
7375
)
7476
end

0 commit comments

Comments
 (0)