From 26559e8aa177913136fa437ab8350491d57ded9b Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 4 Sep 2025 17:00:04 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Drop=20the=20work-around=20for=20the=20brok?= =?UTF-8?q?en=20link=20https://git-scm.com/docs=E4=B8=8A=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In c902ac87c (ci: check for broken git-scm.com links, 2025-02-27), I added a work-around for a link that had been broken in advertently, in a repository different from git-scm.com. I contributed a fix for that with https://github.com/jnavila/git-manpages-l10n/pull/131, but did not want to have git-scm.com's link check to keep failing until that fix was merged. Well, the work-around is no longer necessary because my fix has been merged in the meantime. Signed-off-by: Johannes Schindelin --- .github/workflows/ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff035e2b6e..c76bad3792 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,13 +19,6 @@ jobs: curl -Lo /tmp/hugo.deb https://github.com/gohugoio/hugo/releases/download/v$HUGO_VERSION/hugo_extended_${HUGO_VERSION}_linux-amd64.deb && sudo dpkg -i /tmp/hugo.deb - - name: work around a broken link - # See https://github.com/jnavila/git-manpages-l10n/pull/131; - # A space is missing in "https://git-scm.com/docs上查看" - run: | - sed -i 's,\(href="\(https://git-scm.com/docs\)\)\(上查看\)"\([^>]*>\)\2\3\(\),\1"\4\1\5 \3,p' \ - external/docs/content/docs/git/zh_HANS-CN.html - - name: run Hugo to build the pages run: hugo From 5bbd81a8a407cdf288cbf53db79700bf31dda749 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 4 Sep 2025 17:15:49 +0200 Subject: [PATCH 2/2] Remove a work-around needed during the transition away from Rails In cb4696dfc (deploy: copy back a couple files to help transitioning away from Rails, 2024-09-23), I added a work-around to help keep things working while caches slowly drain and some readers invariably must have been looking at content that had been served from the Rails app (and linked to differently-named CSS files, for example). The caches had ample opportunity to drain in the meantime, it's time to pay down the technical debt and remove that work-around. Signed-off-by: Johannes Schindelin --- .../actions/deploy-to-github-pages/action.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/.github/actions/deploy-to-github-pages/action.yml b/.github/actions/deploy-to-github-pages/action.yml index 231894a6e5..5c8eb4c96d 100644 --- a/.github/actions/deploy-to-github-pages/action.yml +++ b/.github/actions/deploy-to-github-pages/action.yml @@ -85,25 +85,6 @@ runs: shell: bash run: npx -y pagefind@${{ env.PAGEFIND_VERSION }} --site public - - name: Temporarily copy some Rails assets to help the transition - shell: bash - run: | - # To help with the transition from the Rails app to the Hugo/Pagefind site, where - # at least for a while the cached version of git-scm.com might be served via - # Cloudflare, according to the first transition attempt on Sep 20, 2024, potentially - # partially, i.e. _some_ assets might still be cached, _some_ others might not, let's - # copy the most prominent assets to the new page so that, say, the original front page - # won't fail to load the style sheet and Javascript libraries that it needs. - set -x && - mkdir -p public/assets && - for f in application-93865c5c820c24f4c599e8b9c544bcd8a0d03260f9b16c9ba80b6a00082112c9.css \ - application-f7a750114a26afea236a5cc26f6ff3925a14c5901e9ea9018fb869432d0cbee3.js \ - modernize-b3ebe0c31c24f230dc62179d3e1030d2e57a53b1668d9382c0a27dbd44a94beb.js - do - curl -Lfo public/assets/$f https://git-scm.com/assets/$f || - echo "::error::could not copy $f from https://git-scm.com/" >&2 - done - - name: upload GitHub Pages artifact uses: actions/upload-pages-artifact@v3 with: