Skip to content

Commit aed173d

Browse files
authored
Merge branch 'master' into master
2 parents 2bd425f + 4c93073 commit aed173d

23 files changed

+221
-117
lines changed

.github/workflows/Documenter.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: Documenter
2+
23
on:
34
push:
45
branches: [master]
@@ -7,14 +8,20 @@ on:
78

89
jobs:
910
Documenter:
11+
permissions:
12+
actions: write
13+
contents: write
14+
pull-requests: read
15+
statuses: write
1016
name: Documentation
1117
runs-on: ubuntu-latest
1218
steps:
1319
- uses: actions/checkout@v4
14-
- uses: julia-actions/setup-julia@v1
20+
- uses: julia-actions/setup-julia@v2
1521
with:
16-
version: nightly # change this to 1.6 once's that's official
22+
version: '1.10'
1723
show-versioninfo: true # this causes versioninfo to be printed to the action log
24+
- uses: julia-actions/cache@v2
1825
- uses: julia-actions/julia-buildpkg@latest
1926
- uses: julia-actions/julia-docdeploy@latest
2027
env:

.github/workflows/Invalidations.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ jobs:
1616
if: github.base_ref == github.event.repository.default_branch
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: julia-actions/setup-julia@v1
19+
- uses: julia-actions/setup-julia@v2
2020
with:
2121
version: '1'
2222
- uses: actions/checkout@v4
23+
- uses: julia-actions/cache@v2
2324
- uses: julia-actions/julia-buildpkg@v1
2425
- uses: julia-actions/julia-invalidations@v1
2526
id: invs_pr

.github/workflows/TagBot.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,22 @@ on:
44
types:
55
- created
66
workflow_dispatch:
7+
inputs:
8+
lookback:
9+
default: 3
10+
permissions:
11+
actions: read
12+
checks: read
13+
contents: write
14+
deployments: read
15+
issues: read
16+
discussions: read
17+
packages: read
18+
pages: read
19+
pull-requests: read
20+
repository-projects: read
21+
security-events: read
22+
statuses: read
723
jobs:
824
TagBot:
925
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
@@ -12,4 +28,6 @@ jobs:
1228
- uses: JuliaRegistries/TagBot@v1
1329
with:
1430
token: ${{ secrets.GITHUB_TOKEN }}
31+
# Edit the following line to reflect the actual name of the GitHub Secret containing your private key
1532
ssh: ${{ secrets.DOCUMENTER_KEY }}
33+
# ssh: ${{ secrets.NAME_OF_MY_SSH_PRIVATE_KEY_SECRET }}

.github/workflows/test.yml

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,36 @@ on:
99

1010
jobs:
1111
test:
12+
name: Julia ${{ matrix.version }} - ${{ matrix.os }} ${{ matrix.arch }}
1213
runs-on: ${{ matrix.os }}
14+
15+
permissions:
16+
actions: write
17+
contents: read
18+
1319
strategy:
1420
fail-fast: false
1521
matrix:
16-
julia-version: ['1.0', '1.6', '1', 'nightly']
17-
julia-arch: [x64, x86, aarch64]
18-
os: [ubuntu-latest, windows-latest, macOS-13, macOS-14]
19-
exclude:
22+
version:
23+
- '1' # Current stable version
24+
os:
25+
- ubuntu-latest
26+
- windows-latest
27+
arch:
28+
- x64
29+
include:
30+
- os: macOS-latest
31+
arch: aarch64
32+
version: '1'
2033
- os: ubuntu-latest
21-
julia-arch: aarch64
22-
- os: windows-latest
23-
julia-arch: aarch64
24-
- os: macOS-13
25-
julia-arch: x86
26-
- os: macOS-13
27-
julia-arch: aarch64
28-
- os: macOS-14
29-
julia-arch: x86
30-
- os: macOS-14
31-
julia-arch: x64
32-
- os: macOS-14
33-
julia-version: '1.6'
34-
- os: macOS-14
35-
julia-version: '1.0'
36-
34+
arch: x86
35+
version: '1'
36+
- os: ubuntu-latest
37+
arch: x64
38+
version: '1.6'
39+
- os: ubuntu-latest
40+
arch: x64
41+
version: 'nightly'
3742
steps:
3843
- name: Set git to use LF (Windows only)
3944
if: matrix.os == 'windows-latest'
@@ -48,7 +53,9 @@ jobs:
4853
- uses: actions/checkout@v4
4954
- uses: julia-actions/setup-julia@latest
5055
with:
51-
version: ${{ matrix.julia-version }}
56+
version: ${{ matrix.version }}
57+
show-versioninfo: true
58+
- uses: julia-actions/cache@v2
5259
- uses: julia-actions/julia-runtest@latest
5360
env:
5461
JULIA_NUM_THREADS: 2

Project.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "FileIO"
22
uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
3-
version = "1.16.2"
3+
version = "1.16.3"
44

55
[deps]
66
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
@@ -16,6 +16,7 @@ Aqua = "0.8"
1616
CSVFiles = "1"
1717
CodecZlib = "0.5, 0.6, 0.7"
1818
ColorTypes = "0.11"
19+
Downloads = "1.4"
1920
FilePathsBase = "0.9"
2021
HTTP = "0.6, 1"
2122
Random = "<0.0.1, 0.7, 1"
@@ -26,10 +27,11 @@ Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
2627
CSVFiles = "5d742f6a-9f54-50ce-8119-2520741973ca"
2728
CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193"
2829
ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
30+
Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
2931
FilePathsBase = "48062228-2e41-5def-b9a4-89aafe57970f"
3032
HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
3133
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
3234
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
3335

3436
[targets]
35-
test = ["Aqua", "ColorTypes", "CodecZlib", "CSVFiles", "FilePathsBase", "HTTP", "Random", "Test"]
37+
test = ["Aqua", "ColorTypes", "CodecZlib", "CSVFiles", "Downloads", "FilePathsBase", "HTTP", "Random", "Test"]

docs/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ ImageIO = "82e4d734-157c-48bb-816b-45c225c6df19"
55
PNGFiles = "f57f5aa1-a3ce-4bc8-8ab9-96f992907883"
66

77
[compat]
8-
Documenter = "0.26"
8+
Documenter = "1"
99
HTTP = "0.9"

docs/make.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Documenter
22
using FileIO
33

4-
include("make_docs.jl")
4+
include("populate_registry.jl")
55

66
makedocs(
77
sitename = "FileIO",
@@ -15,6 +15,7 @@ makedocs(
1515
"world_age_issue.md",
1616
"reference.md",
1717
],
18+
checkdocs = :exports,
1819
)
1920

2021
deploydocs(

docs/make_docs.jl renamed to docs/populate_registry.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ fs = open(joinpath(pkgdir(FileIO), "docs", "src", "registry.md"), "w")
9090

9191
println(fs, """
9292
| Format Name | extensions | IO library | detection or magic number |
93-
| ----------- | ---------- | ---------- | ---------- |""")
93+
| ----------- | ---------- | ---------- | ------------------------- |""")
9494
include(joinpath(pkgdir(FileIO), "src", "registry.jl"))
9595

9696
close(fs)

docs/src/implementing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ closing any streams you opened in order to read or write the file. If you are
8787
given a `Stream`, your `close` method should only do the clean up for your
8888
reader or writer type, not close the stream.
8989

90-
```jl
90+
```julia
9191
struct WAVReader
9292
io::IO
9393
ownstream::Bool

docs/src/index.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ provide support for standard file formats through functions named
1313
Install FileIO within Julia via
1414

1515
```julia
16-
julia> using Pkg
17-
18-
julia> Pkg.add("FileIO")
16+
using Pkg
17+
Pkg.add("FileIO")
1918
```
2019

2120
## Usage

0 commit comments

Comments
 (0)