From 16bd6dc5b265759f367fb9f623bd4bab0f89e4ee Mon Sep 17 00:00:00 2001 From: Nikita Wootten Date: Wed, 6 Dec 2023 14:50:49 -0500 Subject: [PATCH 1/2] Ignore links to reference (fix lychee error on latest redirect) --- support/lychee.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/support/lychee.toml b/support/lychee.toml index 9a300925f..a3ed5e591 100644 --- a/support/lychee.toml +++ b/support/lychee.toml @@ -18,5 +18,8 @@ exclude = [ 'https://search.usa.gov/search', 'https://example.com/.*', 'https://doi.org/.*', - 'http://doi.org/.*' -] \ No newline at end of file + 'http://doi.org/.*', + # Hack: Lychee does not handle links to the base url. + # This only occurs in redirects (latest -> v1.1.x) + 'https://pages.nist.gov/OSCAL-Reference/models/.*', +] From 6465689a05b211b6d549864121069139dcbb832e Mon Sep 17 00:00:00 2001 From: Nikita Wootten Date: Wed, 6 Dec 2023 15:01:07 -0500 Subject: [PATCH 2/2] Revert linkcheck ignore logic update --- .github/workflows/pages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pages.yaml b/.github/workflows/pages.yaml index 4b3b216f4..8dbd06c75 100644 --- a/.github/workflows/pages.yaml +++ b/.github/workflows/pages.yaml @@ -153,7 +153,7 @@ jobs: uses: peaceiris/actions-gh-pages@068dc23d9710f1ba62e86896f84735d869951305 # Deploy if on main branch and EITHER the linkcheck succeeds or ignore_linkcheck has been flipped # crucially ignore periodic checks - if: github.ref == 'refs/heads/main' && ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (steps.linkcheck.outcome == 'success' || github.event.inputs.ignore_linkcheck == 'true') }} + if: github.ref == 'refs/heads/main' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (steps.linkcheck.outcome == 'success' || github.event.inputs.ignore_linkcheck) with: personal_token: ${{ secrets.COMMIT_TOKEN }} enable_jekyll: false