From af52e51d68265a14402693c45685271a693f8d77 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sat, 1 Nov 2025 09:01:14 -0700 Subject: [PATCH 1/8] Align workflows with other OpenTelemetry Java repositories - Add OSSF scorecard comment to gradle-wrapper-validation --- .github/workflows/gradle-wrapper-validation.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 850fc56e..6069c908 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -13,4 +13,5 @@ jobs: steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + # this needs to be in its own workflow in order to make OSSF scorecard happy - uses: gradle/actions/wrapper-validation@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0 From 4ebc1c0429a3aafb353d1a4977c1e4229f15d4c3 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sat, 1 Nov 2025 09:21:18 -0700 Subject: [PATCH 2/8] Align prepare-release-branch comment to 'for git push to PR branch' Standardize permissions comment for consistency across repositories. --- .github/workflows/prepare-release-branch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prepare-release-branch.yml b/.github/workflows/prepare-release-branch.yml index 8a2642e6..9ee4f53a 100644 --- a/.github/workflows/prepare-release-branch.yml +++ b/.github/workflows/prepare-release-branch.yml @@ -25,7 +25,7 @@ jobs: create-pull-request-against-release-branch: permissions: - contents: write # for Git to git push + contents: write # for git push to PR branch runs-on: ubuntu-latest needs: - prereqs @@ -86,7 +86,7 @@ jobs: create-pull-request-against-main: permissions: - contents: write # for Git to git push + contents: write # for git push to PR branch runs-on: ubuntu-latest needs: - prereqs From 450f7acedd87fd91e3b883fc21121103fdb3e460 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sat, 1 Nov 2025 09:28:02 -0700 Subject: [PATCH 3/8] Switch from archived client9/misspell to golangci/misspell --- .github/workflows/reusable-misspell-check.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/reusable-misspell-check.yml b/.github/workflows/reusable-misspell-check.yml index 9de2b744..56df6633 100644 --- a/.github/workflows/reusable-misspell-check.yml +++ b/.github/workflows/reusable-misspell-check.yml @@ -14,8 +14,7 @@ jobs: - name: Install misspell run: | - curl -L -o install-misspell.sh https://raw.githubusercontent.com/client9/misspell/master/install-misspell.sh - sh ./install-misspell.sh + curl -sfL https://raw.githubusercontent.com/golangci/misspell/master/install-misspell.sh | sh -s -- -b bin - name: Run misspell run: bin/misspell -error . From 457c995e5235bf3472c6832ce35f7f2fd3aad6d7 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sat, 1 Nov 2025 09:57:33 -0700 Subject: [PATCH 4/8] Add concurrency guard to build workflow --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5da7455e..29ac56ab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,6 +10,10 @@ on: permissions: contents: read +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} + cancel-in-progress: true + jobs: common: uses: ./.github/workflows/build-common.yml From 59a23754a05593b24c6d87db1f4a5cab04835f3c Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sat, 1 Nov 2025 10:02:39 -0700 Subject: [PATCH 5/8] Remove concurrency guard from push-only workflow --- .github/workflows/build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 29ac56ab..5da7455e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,10 +10,6 @@ on: permissions: contents: read -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} - cancel-in-progress: true - jobs: common: uses: ./.github/workflows/build-common.yml From 187df009af3abb0886bff22c48f72573ba225545 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sat, 1 Nov 2025 10:14:38 -0700 Subject: [PATCH 6/8] Align lychee config: use double quotes --- .github/config/lychee.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/config/lychee.toml b/.github/config/lychee.toml index 34e5534b..984620f9 100644 --- a/.github/config/lychee.toml +++ b/.github/config/lychee.toml @@ -11,9 +11,9 @@ include_fragments = true remap = [ # workaround for https://github.com/lycheeverse/lychee/issues/1729 - 'https://github.com/(.*?)/(.*?)/blob/(.*?)/(.*#.*)$ https://raw.githubusercontent.com/$1/$2/$3/$4', + "https://github.com/(.*?)/(.*?)/blob/(.*?)/(.*#.*)$ https://raw.githubusercontent.com/$1/$2/$3/$4", ] exclude = [ - '^https://github.com/.*#discussion_r.*$', + "^https://github.com/.*#discussion_r.*$", ] From 76276ae21b90281fe2e57f5a084b25ede8c3a232 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sat, 1 Nov 2025 10:19:19 -0700 Subject: [PATCH 7/8] Align CODEOWNERS header with standard format --- .github/CODEOWNERS | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d9bcbf9f..fe1f3796 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,5 +1,10 @@ -# Code owners file. -# This file controls who is tagged for review for any given pull request. +# +# Learn about membership in OpenTelemetry community: +# https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md +# +# +# Learn about CODEOWNERS file format: +# https://help.github.com/en/articles/about-code-owners +# - # For anything not explicitly taken by someone else: * @open-telemetry/java-approvers @open-telemetry/java-instrumentation-approvers From 363cf06c17fe4f4aa179b8de99ff460f858d6fbf Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sat, 1 Nov 2025 10:31:51 -0700 Subject: [PATCH 8/8] Remove redundant CODEOWNERS format section from header --- .github/CODEOWNERS | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index fe1f3796..f3ea4b21 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -2,9 +2,5 @@ # Learn about membership in OpenTelemetry community: # https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md # -# -# Learn about CODEOWNERS file format: -# https://help.github.com/en/articles/about-code-owners -# * @open-telemetry/java-approvers @open-telemetry/java-instrumentation-approvers