Skip to content

Commit d03c857

Browse files
committed
Require Julia v1.6, update CI
1 parent fb1717b commit d03c857

File tree

6 files changed

+64
-32
lines changed

6 files changed

+64
-32
lines changed

.github/workflows/CompatHelper.yml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,32 @@
11
name: CompatHelper
2-
32
on:
43
schedule:
5-
- cron: '00 00 * * *'
6-
push:
7-
branches:
8-
- actions/trigger/CompatHelper
4+
- cron: 0 0 * * *
95
workflow_dispatch:
106
jobs:
117
CompatHelper:
128
runs-on: ubuntu-latest
139
steps:
14-
- name: Pkg.add("CompatHelper")
15-
run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
16-
- name: CompatHelper.main()
10+
- name: "Add the General registry via Git"
11+
run: |
12+
import Pkg
13+
ENV["JULIA_PKG_SERVER"] = ""
14+
Pkg.Registry.add("General")
15+
shell: julia --color=yes {0}
16+
- name: "Install CompatHelper"
17+
run: |
18+
import Pkg
19+
name = "CompatHelper"
20+
uuid = "aa819f21-2bde-4658-8897-bab36330d9b7"
21+
version = "3"
22+
Pkg.add(; name, uuid, version)
23+
shell: julia --color=yes {0}
24+
- name: "Run CompatHelper"
25+
run: |
26+
import CompatHelper
27+
CompatHelper.main()
28+
shell: julia --color=yes {0}
1729
env:
1830
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1931
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
20-
run: julia -e 'using CompatHelper; CompatHelper.main()'
32+
# COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }}

.github/workflows/ci.yml

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ on:
1010
pull_request:
1111
release:
1212

13+
concurrency:
14+
# Skip intermediate builds: always.
15+
# Cancel intermediate builds: only if it is a pull request build.
16+
group: ${{ github.workflow }}-${{ github.ref }}
17+
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
18+
1319
jobs:
1420
test:
1521
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
@@ -19,24 +25,23 @@ jobs:
1925
fail-fast: false
2026
matrix:
2127
version:
22-
- '1.0'
28+
- '1.6'
2329
- '1'
2430
- 'nightly'
2531
os:
2632
- ubuntu-latest
27-
- macOS-latest
28-
- windows-latest
2933
arch:
3034
- x64
31-
- x86
32-
exclude:
33-
# 32-bit Julia binaries are not available on macOS
34-
- os: macOS-latest
35-
arch: x86
36-
- os: windows-latest
37-
arch: x86
38-
- version: nightly
35+
include:
36+
- version: 1
37+
os: ubuntu-latest
3938
arch: x86
39+
- version: 1
40+
os: macOS-latest
41+
arch: x64
42+
- version: 1
43+
os: windows-latest
44+
arch: x64
4045
steps:
4146
- uses: actions/checkout@v2
4247
- uses: julia-actions/setup-julia@latest
@@ -55,9 +60,15 @@ jobs:
5560
${{ runner.os }}-test-
5661
${{ runner.os }}-
5762
- uses: julia-actions/julia-buildpkg@latest
63+
env:
64+
PYTHON: 'Conda'
5865
- uses: julia-actions/julia-runtest@latest
66+
with:
67+
coverage: ${{ matrix.version == '1' && matrix.os == 'ubuntu-latest' && matrix.arch == 'x64' }}
5968
- uses: julia-actions/julia-processcoverage@v1
69+
if: matrix.version == '1' && matrix.os == 'ubuntu-latest' && matrix.arch == 'x64'
6070
- uses: codecov/codecov-action@v1
71+
if: matrix.version == '1' && matrix.os == 'ubuntu-latest' && matrix.arch == 'x64'
6172
with:
6273
file: lcov.info
6374
docs:
@@ -80,6 +91,8 @@ jobs:
8091
${{ runner.os }}-test-
8192
${{ runner.os }}-
8293
- uses: julia-actions/julia-buildpkg@latest
94+
env:
95+
PYTHON: 'Conda'
8396
- uses: julia-actions/julia-docdeploy@latest
8497
env:
8598
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ UnsafeArrays = "c4a57d5a-5b31-53a6-b365-19f8c011fbd6"
1212
Adapt = "1, 2, 3"
1313
Requires = "0.5, 1"
1414
UnsafeArrays = "1"
15-
julia = "1"
15+
julia = "1.6"
1616

1717
[extras]
1818
ElasticArrays = "fdbdab4c-e67f-52f5-8c3f-e7b388dad3d4"

docs/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
33
Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
44

55
[compat]
6-
Documenter = "~0.26"
6+
Documenter = "~0.27"

docs/make.jl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@
77
using Documenter
88
using ArraysOfArrays
99

10+
# Doctest setup
11+
DocMeta.setdocmeta!(
12+
ArraysOfArrays,
13+
:DocTestSetup,
14+
:(using ArraysOfArrays);
15+
recursive=true,
16+
)
17+
1018
makedocs(
1119
sitename = "ArraysOfArrays",
1220
modules = [ArraysOfArrays],

docs/src/api.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
11
# API
22

3-
```@meta
4-
CurrentModule = ArraysOfArrays
5-
DocTestSetup = quote
6-
using ArraysOfArrays
7-
end
3+
## Modules
4+
5+
```@index
6+
Order = [:module]
87
```
98

10-
## Types
9+
## Types and constants
1110

1211
```@index
13-
Order = [:type]
12+
Order = [:type, :constant]
1413
```
1514

16-
## Functions
15+
## Functions and macros
1716

1817
```@index
19-
Order = [:function]
18+
Order = [:macro, :function]
2019
```
2120

2221
# Documentation
2322

2423
```@autodocs
2524
Modules = [ArraysOfArrays]
26-
Order = [:type, :function]
25+
Order = [:module, :type, :constant, :macro, :function]
2726
```

0 commit comments

Comments
 (0)