Skip to content

Commit

Permalink
Merge branch 'master' into lg/broken-less-noisy
Browse files Browse the repository at this point in the history
  • Loading branch information
lgoettgens authored Apr 2, 2024
2 parents 6f749e5 + 6f3067c commit e6d4ab0
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,16 @@ jobs:
julia-version: '1'
- os: windows-latest
julia-version: '1.0'
- os: windows-latest
julia-version: '1.11-nightly'
- os: windows-latest
julia-version: 'nightly'
- os: macOS-latest
julia-version: '1'
- os: macOS-latest
julia-version: '1.0'
- os: macOS-latest
julia-version: '1.11-nightly'
- os: macOS-latest
julia-version: 'nightly'
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- When supplying `broken = true` to `test_ambiguities`, `test_undefined_exports`, `test_piracies`, or `test_unbound_args`, the output is shortened. In particular, the list of offending instances is no longer printed. To get the full output, set `broken = false`. ([#272])
- Use [Changelog.jl](https://github.com/JuliaDocs/Changelog.jl) to generate the changelog, and add it to the documentation. ([#277])
- Use [Changelog.jl](https://github.com/JuliaDocs/Changelog.jl) to generate the changelog, and add it to the documentation. ([#277], [#279])
- `test_project_extras` prints failures the same on all julia versions. In particular, 1.11 and nightly are no outliers. ([#275])


Expand Down
10 changes: 7 additions & 3 deletions docs/instantiate.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@ cd(docs_directory) do
Pkg.instantiate()

# Remove Aqua again from docs/Project.toml
project_toml = TOML.parsefile(joinpath(docs_directory, "Project.toml"))
delete!(project_toml["deps"], "Aqua")
lines = readlines(joinpath(docs_directory, "Project.toml"))
open(joinpath(docs_directory, "Project.toml"), "w") do io
TOML.print(io, project_toml)
for line in lines
if line == "Aqua = \"4c88cf16-eb10-579e-8560-4a9242c79595\""
continue
end
println(io, line)
end
end
end

0 comments on commit e6d4ab0

Please sign in to comment.