Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 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/docs-omnibus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ jobs:
# TODO: Split testing.sh tests into their own steps in this job
- name: Text Sphinx builds with omnibus script
run: |
cd doc && conda run -n ctsm_pylib ./testing.sh
cd doc && ./testing.sh
4 changes: 2 additions & 2 deletions .github/workflows/fleximod_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: actions/checkout@v4
- id: run-fleximod
run: |
$GITHUB_WORKSPACE/bin/git-fleximod update
$GITHUB_WORKSPACE/bin/git-fleximod update -o
echo
echo "Update complete, checking status"
echo
Expand All @@ -32,4 +32,4 @@ jobs:
echo
echo "Checking if git fleximod matches expected externals"
echo
git diff --exit-code
git add . && git diff --exit-code && git diff --cached --exit-code
6 changes: 5 additions & 1 deletion doc/testing.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
set -e
set -x

SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
cd "${SCRIPT_DIR}"

../bin/git-fleximod update -o
rm -rf _publish*

# Build all docs using container
Expand Down Expand Up @@ -34,7 +38,7 @@ rm -rf _build_container
# Check that Makefile method works
echo "~~~~~ Check that Makefile method works"
rm -rf _build
make SPHINXOPTS="-W --keep-going" BUILDDIR=${PWD}/_build html
conda run -n ctsm_pylib make SPHINXOPTS="-W --keep-going" BUILDDIR=${PWD}/_build html

# Check that -b works
echo "~~~~~ Check that -b works (Podman)"
Expand Down
1 change: 1 addition & 0 deletions libraries/FTorch
Submodule FTorch added at 79e767
Loading