Skip to content

Commit

Permalink
update to sphinx 2.4. (#670)
Browse files Browse the repository at this point in the history
This uses the image used to build documentation from which has
the incompatible sphinx 2.4. We'd need to backport this commit to
any release branch we update.
  • Loading branch information
johrstrom authored Apr 26, 2022
1 parent f069a55 commit bb91fd3
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: actions/checkout@v2

- name: Make Html
run: docker run --rm -v "${PWD}:/doc" -u "$(id -u):$(id -g)" ohiosupercomputer/docker-sphinx make html
run: docker run --rm -v "${PWD}:/doc" -u "$(id -u):$(id -g)" ohiosupercomputer/ood-doc-build:v2.0.0 make html

- name: Publish to the test repo
run: GITHUB_TOKEN=${{ secrets.OSC_WIAG_PUB_REPO_TOKEN }} /bin/bash push.sh "ood-documentation-test"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Currently all builds are generated using the
built using the following command from the root of this repo:

```bash
docker run --rm -i -t -v "${PWD}:/doc" -u "$(id -u):$(id -g)" ohiosupercomputer/docker-sphinx make html
docker run --rm -i -t -v "${PWD}:/doc" -u "$(id -u):$(id -g)" ohiosupercomputer/ood-doc-build make html
```

Or use the rake task added:
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace :docker do

desc "Build docs using docker"
task :build do
exec 'docker run --rm -i -t -v "${PWD}:/doc" -u "$(id -u):$(id -g)" ohiosupercomputer/docker-sphinx make html'
exec 'docker run --rm -i -t -v "${PWD}:/doc" -u "$(id -u):$(id -g)" ohiosupercomputer/ood-doc-build make html'
end
end

Expand Down
16 changes: 4 additions & 12 deletions source/customizations.rst
Original file line number Diff line number Diff line change
Expand Up @@ -783,12 +783,8 @@ that lists all user quotas. The JSON schema for version `1` is given as:
"version": 1,
"timestamp": 1525361263,
"quotas": [
{
...
},
{
...
}
{},
{}
]
}
Expand Down Expand Up @@ -879,12 +875,8 @@ that lists all user balances. The JSON schema for version `1` is given as:
"project_type": "project"
},
"balances": [
{
...
},
{
...
}
{},
{}
]
}
Expand Down

0 comments on commit bb91fd3

Please sign in to comment.