From ec3ddd6cbccab6cdd519b81ce63c9612b1f3d0ed Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Tue, 24 Sep 2024 12:29:00 -0600 Subject: [PATCH 1/2] Fix docs CI mistake. --- .github/workflows/docs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 0d631d8ed..5efaff412 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -2,9 +2,9 @@ name: Nalu-Wind-Docs on: push: - branches: [main] + branches: [master] pull_request: - branches: [main] + branches: [master] concurrency: group: ${{github.ref}}-${{github.head_ref}}-docs From 25b36ddabcabbcf4eabbfc362ff86b2ca44a6325 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Tue, 24 Sep 2024 12:32:23 -0600 Subject: [PATCH 2/2] Don't fail on warnings yet. --- .github/workflows/docs.yml | 2 +- .readthedocs.yml | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 .readthedocs.yml diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 5efaff412..1281f1d4d 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -46,7 +46,7 @@ jobs: egrep "WARNING:" build-output.txt | sort | uniq | \ awk 'BEGIN{i=0}{print $0}{i++}END{print "Warnings: "i}' > build-output-warnings.txt cat build-output-warnings.txt - exit $(tail -n 1 build-output-warnings.txt | awk '{print $2}') + #exit $(tail -n 1 build-output-warnings.txt | awk '{print $2}') - name: Deploy if: github.event_name == 'push' uses: JamesIves/github-pages-deploy-action@releases/v3 diff --git a/.readthedocs.yml b/.readthedocs.yml deleted file mode 100644 index bd70bf602..000000000 --- a/.readthedocs.yml +++ /dev/null @@ -1,12 +0,0 @@ -# .readthedocs.yml -version: 2 -sphinx: - builder: html - configuration: docs/conf.py -formats: all -python: - version: 3.7 - install: - - requirements: docs/requirements.txt -submodules: - exclude: all