From c21c13609911bf8d818a737e52920d6309560d62 Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Tue, 4 Mar 2025 11:36:35 +0100 Subject: [PATCH 1/7] update actions versions --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4fc9fff3..512a2721 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,14 +21,14 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - name: Restore lychee (linkcheck) cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: .lycheecache key: cache-lychee-${{ github.sha }} restore-keys: cache-lychee- # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # Install newer python and pip - uses: actions/setup-python@v4 @@ -46,7 +46,7 @@ jobs: # link check of html - name: Run lychee - uses: lycheeverse/lychee-action@v1.5.4 + uses: lycheeverse/lychee-action@v2.3.0 with: fail: true args: --cache --max-cache-age 1d './**/*.html' --timeout 40 From 77661b057ac395c5591cfc087e964e723f0e74ae Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Tue, 4 Mar 2025 11:43:09 +0100 Subject: [PATCH 2/7] remove twitter links. --- docs/about/communication.md | 6 ------ docs/index.rst | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/docs/about/communication.md b/docs/about/communication.md index ff2dfd6a..de263a11 100644 --- a/docs/about/communication.md +++ b/docs/about/communication.md @@ -69,12 +69,6 @@ There are two mailing list currently: *** -### Twitter - -Contact us or just follow the latest OpenMS news on Twitter. - -*** - Join the OpenMS Community ------------------------- diff --git a/docs/index.rst b/docs/index.rst index 2c5f6ad1..82718b4f 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -29,7 +29,7 @@ OpenMS is developed by a group of `core developers `_ or become active by `developing new tools yourself `_. * Donate to the OpenMS project using our `opencollective `_ account. All donations will be used strictly to fund the development of Openms’s open source software, documentation, and community. -* Promote OpenMS either online (`e.g. on X `_) or in your work group. +* Promote OpenMS either online or in your work group. .. toctree:: From af72ecc2742bac2bbd0485bedf350b969d1399e7 Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Tue, 4 Mar 2025 11:52:20 +0100 Subject: [PATCH 3/7] rollback to latest v1 for lychee --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 512a2721..a25826ce 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,7 +46,7 @@ jobs: # link check of html - name: Run lychee - uses: lycheeverse/lychee-action@v2.3.0 + uses: lycheeverse/lychee-action@v1 with: fail: true args: --cache --max-cache-age 1d './**/*.html' --timeout 40 From 56ea4271dbd63dd2384a07608ce2447cee1f9713 Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Tue, 4 Mar 2025 11:58:49 +0100 Subject: [PATCH 4/7] exclude academic.oup.com --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a25826ce..a215def5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -49,7 +49,7 @@ jobs: uses: lycheeverse/lychee-action@v1 with: fail: true - args: --cache --max-cache-age 1d './**/*.html' --timeout 40 + args: --cache --max-cache-age 1d './**/*.html' --timeout 40 --exclude "academic.oup.com" # upload html - uses: actions/upload-artifact@v4 From eb0812f6b993d7c4d0e5fb2f9658ca9e50d0088a Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Tue, 4 Mar 2025 12:05:56 +0100 Subject: [PATCH 5/7] Add retry to Lychee args --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a215def5..813b711f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -49,7 +49,7 @@ jobs: uses: lycheeverse/lychee-action@v1 with: fail: true - args: --cache --max-cache-age 1d './**/*.html' --timeout 40 --exclude "academic.oup.com" + args: --cache --max-cache-age 1d './**/*.html' --timeout 40 --exclude "academic.oup.com" --retry 3 # upload html - uses: actions/upload-artifact@v4 From 1b969cadca60672440cd195bf4e5f87b46e4e244 Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Tue, 4 Mar 2025 12:12:08 +0100 Subject: [PATCH 6/7] bump up retry time, don't cache 5xx status' --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 813b711f..7585572c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -49,7 +49,7 @@ jobs: uses: lycheeverse/lychee-action@v1 with: fail: true - args: --cache --max-cache-age 1d './**/*.html' --timeout 40 --exclude "academic.oup.com" --retry 3 + args: --cache --max-cache-age 1d './**/*.html' --timeout 40 --exclude "academic.oup.com" --cache-exclude-status 500.. --retry-wait-time 3 # upload html - uses: actions/upload-artifact@v4 From 2525492eb76a0fdca9b7700f8c47cb6a8e0ed7c8 Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Tue, 4 Mar 2025 12:13:48 +0100 Subject: [PATCH 7/7] remove cache-exclude-status since it's not supported in this version --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7585572c..036230fb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -49,7 +49,7 @@ jobs: uses: lycheeverse/lychee-action@v1 with: fail: true - args: --cache --max-cache-age 1d './**/*.html' --timeout 40 --exclude "academic.oup.com" --cache-exclude-status 500.. --retry-wait-time 3 + args: --cache --max-cache-age 1d './**/*.html' --timeout 40 --exclude "academic.oup.com" --retry-wait-time 3 # upload html - uses: actions/upload-artifact@v4