Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
pull_request:
push:
branches:
- master
- main
tags:
- '*'
jobs:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Documenter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
name: Documenter

on:
# Runs on pushes targeting the `main` branch. Change this to `master` if you're
# using the `master` branch as the default branch.
# Runs on pushes targeting the `main` branch. Change this to `main` if you're
# using the `main` branch as the default branch.
push:
branches:
- master
- main
tags: ['*']
pull_request:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/IntegrationTest.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: IntegrationTest
on:
push:
branches: [master]
branches: [main]
tags: [v*]
pull_request:

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[docs-stable-img]: https://img.shields.io/badge/docs-stable-blue.svg
[docs-stable-url]: https://JuliaDataCubes.github.io/YAXArrays.jl/stable/

[codecov-img]: https://codecov.io/gh/JuliaDataCubes/YAXArrays.jl/branch/master/graph/badge.svg
[codecov-img]: https://codecov.io/gh/JuliaDataCubes/YAXArrays.jl/branch/main/graph/badge.svg
[codecov-url]: https://codecov.io/gh/JuliaDataCubes/YAXArrays.jl

[ci-img]: https://github.com/JuliaDataCubes/YAXArrays.jl/workflows/CI/badge.svg
Expand Down
4 changes: 2 additions & 2 deletions docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ makedocs(; sitename="YAXArrays.jl",
checkdocs=:all,
format=DocumenterVitepress.MarkdownVitepress(
repo = "github.com/JuliaDataCubes/YAXArrays.jl", # this must be the full URL!
devbranch = "master",
devbranch = "main",
devurl = "dev";
),
draft=false,
Expand All @@ -21,6 +21,6 @@ DocumenterVitepress.deploydocs(;
repo="github.com/JuliaDataCubes/YAXArrays.jl.git", # this must be the full URL!
target=joinpath(@__DIR__, "build"),
branch = "gh-pages",
devbranch="master",
devbranch="main",
push_preview = true
)
10 changes: 5 additions & 5 deletions docs/src/.vitepress/config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ const navTemp = {
{
text: 'ESDL studies',
items: [
{ text: 'ESDL study 1', link: 'https://github.com/JuliaDataCubes/YAXArrays.jl/blob/master/docs/src/tutorials/esdl/examples_from_esdl_study_1.jl' },
{ text: 'ESDL study 2', link: 'https://github.com/JuliaDataCubes/YAXArrays.jl/blob/master/docs/src/tutorials/esdl/examples_from_esdl_study_2.jl' },
{ text: 'ESDL study 3', link: 'https://github.com/JuliaDataCubes/YAXArrays.jl/blob/master/docs/src/tutorials/esdl/examples_from_esdl_study_3.jl' },
{ text: 'ESDL study 4', link: 'https://github.com/JuliaDataCubes/YAXArrays.jl/blob/master/docs/src/tutorials/esdl/examples_from_esdl_study_4.jl' },
{ text: 'ESDL study 1', link: 'https://github.com/JuliaDataCubes/YAXArrays.jl/blob/main/docs/src/tutorials/esdl/examples_from_esdl_study_1.jl' },
{ text: 'ESDL study 2', link: 'https://github.com/JuliaDataCubes/YAXArrays.jl/blob/main/docs/src/tutorials/esdl/examples_from_esdl_study_2.jl' },
{ text: 'ESDL study 3', link: 'https://github.com/JuliaDataCubes/YAXArrays.jl/blob/main/docs/src/tutorials/esdl/examples_from_esdl_study_3.jl' },
{ text: 'ESDL study 4', link: 'https://github.com/JuliaDataCubes/YAXArrays.jl/blob/main/docs/src/tutorials/esdl/examples_from_esdl_study_4.jl' },
]
},
{ text: 'Other Tutorials', link: '/tutorials/other_tutorials' },
Expand Down Expand Up @@ -177,7 +177,7 @@ export default defineConfig({
},
],
editLink: {
pattern: 'https://github.com/JuliaDataCubes/YAXArrays.jl/edit/master/docs/src/:path'
pattern: 'https://github.com/JuliaDataCubes/YAXArrays.jl/edit/main/docs/src/:path'
},
socialLinks: [
// { icon: 'github', link: 'https://github.com/JuliaDataCubes/YAXArrays.jl' }
Expand Down
4 changes: 2 additions & 2 deletions docs/src/development/contribute.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ Pull requests and bug reports are always welcome at the [YAXArrays.jl GitHub rep

## Contribute to Documentation

Contributing with examples can be done by first creating a new file example [here](https://github.com/JuliaDataCubes/YAXArrays.jl/tree/master/docs/examples/UserGuide)
Contributing with examples can be done by first creating a new file example [here](https://github.com/JuliaDataCubes/YAXArrays.jl/tree/main/docs/examples/UserGuide)

::: info new file
- `your_new_file.md` at `docs/src/UserGuide/`


:::

Once this is done you need to add a new entry [here](https://github.com/JuliaDataCubes/YAXArrays.jl/blob/master/docs/src/.vitepress/config.mts) at the appropriate level.
Once this is done you need to add a new entry [here](https://github.com/JuliaDataCubes/YAXArrays.jl/blob/main/docs/src/.vitepress/config.mts) at the appropriate level.

::: info add entry to docs

Expand Down
2 changes: 1 addition & 1 deletion docs/src/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ pkg> add YAXArrays
If you want to use the latest unreleased version, you can run the following command:

```julia
pkg> add YAXArrays#master
pkg> add YAXArrays#main
```

## Want interoperability?
Expand Down
Loading