From c15418d962c6f984a4ddaebb146639125385f366 Mon Sep 17 00:00:00 2001 From: Kwankyu Lee Date: Mon, 6 Nov 2023 10:39:51 +0900 Subject: [PATCH 1/4] Continue on error of building live doc --- .github/workflows/doc-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml index e079fa04beb..bd789779245 100644 --- a/.github/workflows/doc-build.yml +++ b/.github/workflows/doc-build.yml @@ -201,6 +201,7 @@ jobs: - name: Build live doc id: buildlivedoc if: (success() || failure()) && steps.copy.outcome == 'success' && github.repository == 'sagemath/sage' && github.ref == 'refs/heads/develop' + continue-on-error: true run: | set -ex export SAGE_USE_CDNS=yes From c1faab9433204079f132a7d158e141bc88672974 Mon Sep 17 00:00:00 2001 From: Kwankyu Lee Date: Mon, 6 Nov 2023 13:11:42 +0900 Subject: [PATCH 2/4] Remove code distorting worktree --- .github/workflows/doc-build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml index bd789779245..10c9525d8a8 100644 --- a/.github/workflows/doc-build.yml +++ b/.github/workflows/doc-build.yml @@ -162,7 +162,7 @@ jobs: EOF echo '' >> ./docs/CHANGES.html echo '' >> ./docs/CHANGES.html - (cd /sage/local/share/doc/sage/html && git diff HEAD^ -- *.html; rm -rf .git) > ./docs/diff.txt + (cd /sage/local/share/doc/sage/html && git diff HEAD^ -- *.html) > ./docs/diff.txt /sage/sage -python - << EOF import re, html with open('./docs/diff.txt', 'r') as f: @@ -182,7 +182,6 @@ jobs: echo '' >> ./docs/CHANGES.html echo '' >>./docs/CHANGES.html rm ./docs/diff.txt ./docs/diff.html - (cd /sage/local/share/doc/sage/html && git reset --hard HEAD) # For some reason the deploy step below cannot find /sage/... # So copy everything from there to local folder # We also need to replace the symlinks because netlify is not following them From c4d3fd7d6b8b9e8857ce3c372f4b403fceb7c8cf Mon Sep 17 00:00:00 2001 From: Kwankyu Lee Date: Mon, 6 Nov 2023 13:34:38 +0900 Subject: [PATCH 3/4] Adding continue-on-error may disrupt doc-publish --- .github/workflows/doc-build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml index 10c9525d8a8..7f9e07aafe2 100644 --- a/.github/workflows/doc-build.yml +++ b/.github/workflows/doc-build.yml @@ -200,7 +200,6 @@ jobs: - name: Build live doc id: buildlivedoc if: (success() || failure()) && steps.copy.outcome == 'success' && github.repository == 'sagemath/sage' && github.ref == 'refs/heads/develop' - continue-on-error: true run: | set -ex export SAGE_USE_CDNS=yes From 33664560681dc013be7190d5adfc498880ac8974 Mon Sep 17 00:00:00 2001 From: Kwankyu Lee Date: Mon, 6 Nov 2023 15:13:02 +0900 Subject: [PATCH 4/4] Remove .git for sure --- .github/workflows/doc-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml index 7f9e07aafe2..3660ff3a947 100644 --- a/.github/workflows/doc-build.yml +++ b/.github/workflows/doc-build.yml @@ -162,7 +162,7 @@ jobs: EOF echo '' >> ./docs/CHANGES.html echo '' >> ./docs/CHANGES.html - (cd /sage/local/share/doc/sage/html && git diff HEAD^ -- *.html) > ./docs/diff.txt + (cd /sage/local/share/doc/sage/html && git diff HEAD^ -- *.html; rm -rf .git) > ./docs/diff.txt /sage/sage -python - << EOF import re, html with open('./docs/diff.txt', 'r') as f: