From 099ca681d801ae0321c45bfe2aad0d09f178d372 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 30 Jun 2025 00:32:12 +0000 Subject: [PATCH 1/2] Initial plan From f796ecb2cce1e06bb871e4d5daf245a34f50a913 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 30 Jun 2025 00:37:09 +0000 Subject: [PATCH 2/2] Make it easier to run lychee locally Co-authored-by: trask <218610+trask@users.noreply.github.com> --- .github/scripts/check-links.sh | 35 +++++++++++++++++++ .github/scripts/dependencies.dockerfile | 3 ++ .github/workflows/build.yml | 4 +-- .github/workflows/reusable-check-links.yml | 18 ++++++++++ .../reusable-markdown-link-check.yml | 23 ------------ .lychee.toml | 15 ++++++++ 6 files changed, 73 insertions(+), 25 deletions(-) create mode 100755 .github/scripts/check-links.sh create mode 100644 .github/scripts/dependencies.dockerfile create mode 100644 .github/workflows/reusable-check-links.yml delete mode 100644 .github/workflows/reusable-markdown-link-check.yml create mode 100644 .lychee.toml diff --git a/.github/scripts/check-links.sh b/.github/scripts/check-links.sh new file mode 100755 index 000000000..20e35d07e --- /dev/null +++ b/.github/scripts/check-links.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +set -e + +export MSYS_NO_PATHCONV=1 # for Git Bash on Windows + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +LYCHEE_CONFIG="$SCRIPT_DIR/../../.lychee.toml" +DEPENDENCIES_DOCKERFILE="$SCRIPT_DIR/dependencies.dockerfile" + +# Extract lychee version from dependencies.dockerfile +LYCHEE_VERSION=$(grep "FROM lycheeverse/lychee:" "$DEPENDENCIES_DOCKERFILE" | sed 's/.*FROM lycheeverse\/lychee:\([^ ]*\).*/\1/') + +# Build the lychee command with optional GitHub token +CMD="lycheeverse/lychee:$LYCHEE_VERSION --verbose --config $(basename "$LYCHEE_CONFIG")" + +# Add GitHub token if available +if [[ -n "$GITHUB_TOKEN" ]]; then + CMD="$CMD --github-token $GITHUB_TOKEN" +fi + +# Add the target directory +CMD="$CMD ." + +# Determine if we should allocate a TTY +DOCKER_FLAGS="--rm --init" +if [[ -t 0 ]]; then + DOCKER_FLAGS="$DOCKER_FLAGS -it" +else + DOCKER_FLAGS="$DOCKER_FLAGS -i" +fi + +# Run lychee with proper signal handling +# shellcheck disable=SC2086 +exec docker run $DOCKER_FLAGS -v "$(dirname "$LYCHEE_CONFIG")":/data -w /data $CMD \ No newline at end of file diff --git a/.github/scripts/dependencies.dockerfile b/.github/scripts/dependencies.dockerfile new file mode 100644 index 000000000..f76746362 --- /dev/null +++ b/.github/scripts/dependencies.dockerfile @@ -0,0 +1,3 @@ +# this file exists so that Renovate can auto-update docker image versions that are then used elsewhere + +FROM lycheeverse/lychee:sha-2aa22f8@sha256:2e3786630482c41f9f2dd081e06d7da1c36d66996e8cf6573409b8bc418d48c4 AS lychee \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4850fa48c..be582e0db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -118,8 +118,8 @@ jobs: name: integration-test-results path: jmx-metrics/build/reports/tests/integrationTest - markdown-link-check: - uses: ./.github/workflows/reusable-markdown-link-check.yml + check-links: + uses: ./.github/workflows/reusable-check-links.yml markdown-lint-check: uses: ./.github/workflows/reusable-markdown-lint.yml diff --git a/.github/workflows/reusable-check-links.yml b/.github/workflows/reusable-check-links.yml new file mode 100644 index 000000000..de3ac246e --- /dev/null +++ b/.github/workflows/reusable-check-links.yml @@ -0,0 +1,18 @@ +name: Reusable - Check links + +on: + workflow_call: + +permissions: + contents: read + +jobs: + check-links: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + + - name: Check links + env: + GITHUB_TOKEN: ${{ github.token }} + run: ./.github/scripts/check-links.sh \ No newline at end of file diff --git a/.github/workflows/reusable-markdown-link-check.yml b/.github/workflows/reusable-markdown-link-check.yml deleted file mode 100644 index 3120678ce..000000000 --- a/.github/workflows/reusable-markdown-link-check.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Reusable - Markdown link check - -on: - workflow_call: - -permissions: - contents: read - -jobs: - markdown-link-check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - - uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2.4.1 - with: - # excluding links to pull requests and issues is done for performance - args: > - --include-fragments - --exclude "^https://github.com/open-telemetry/opentelemetry-java-contrib/(issues|pull)/\\d+$" - --max-retries 6 - --max-concurrency 1 - . diff --git a/.lychee.toml b/.lychee.toml new file mode 100644 index 000000000..3d1f2ce28 --- /dev/null +++ b/.lychee.toml @@ -0,0 +1,15 @@ +retry_wait_time = 5 +max_retries = 6 +max_concurrency = 4 + +# Check link anchors +include_fragments = true + +# excluding links to pull requests and issues is done for performance +exclude = [ + '^https://github.com/open-telemetry/opentelemetry-java-contrib/(issues|pull)/\d+$', + '^https://github.com/open-telemetry/opentelemetry-java-instrumentation/(issues|pull)/\d+$', + '^https://github.com/GoogleCloudPlatform/opentelemetry-java-docs/issues/.*', + '^https://softwareengineering.stackexchange.com/questions/29727.*', + '^https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/io/opentelemetry/$', +] \ No newline at end of file