From bc5699ce7890e1ee169ff9b894955ba96761a9cc Mon Sep 17 00:00:00 2001 From: Jeff Ohrstrom Date: Fri, 27 Dec 2024 12:27:31 -0500 Subject: [PATCH] update the CI to use v3 image and rake task (#1047) * update the CI to use v3 image and rake task * specify ruby version --- .github/workflows/publish.yml | 9 +++++++-- Rakefile | 2 +- source/conf.py | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 445808768..c7fd7f6cd 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,10 +18,15 @@ jobs: - name: checkout uses: actions/checkout@v3 + - name: Setup ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.3' + bundler-cache: true + - name: Make Html run: | - export OOD_BRANCH=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} - docker run --rm -v "${PWD}:/doc" -u "$(id -u):$(id -g)" -e OOD_BRANCH ohiosupercomputer/ood-doc-build:v2.0.0 make html + rake build - name: Publish to the test repo run: GITHUB_TOKEN=${{ secrets.OSC_WIAG_PUB_REPO_TOKEN }} /bin/bash push.sh "ood-documentation-test" diff --git a/Rakefile b/Rakefile index a7a4c9b5f..552e05597 100644 --- a/Rakefile +++ b/Rakefile @@ -25,7 +25,7 @@ def user_group end def image - 'ohiosupercomputer/ood-doc-build:v2.0.0' + 'ohiosupercomputer/ood-doc-build:v3.0.0' end def docker? diff --git a/source/conf.py b/source/conf.py index 0c34a0db0..8f3ec0623 100644 --- a/source/conf.py +++ b/source/conf.py @@ -77,7 +77,7 @@ # # This is also used if you do content translation via gettext catalogs. # Usually you set "language" from the command line for these cases. -language = None +language = 'en' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: @@ -405,7 +405,7 @@ def rstjinja(app, docname, source): def setup(app): app.connect('source-read', rstjinja) - app.add_stylesheet('css/custom.css') + app.add_css_file('css/custom.css') # Context used for jinja template doc_context = {