Skip to content

Commit 3ffe878

Browse files
authored
Merge branch 'main' into fix/deprecate-otel-exporter-reader-ctor
2 parents 02b1dc3 + 52124a3 commit 3ffe878

19 files changed

Lines changed: 67 additions & 26 deletions

File tree

.github/workflows/api-diff.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
version: v2026.6.14
3838
sha256: 96ae1ef7b00a6ebbbec23ba1016d6e722f5e904966272f621d15326429e90d53
3939
- name: Cache local Maven repository
40-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
40+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
4141
with:
4242
path: ~/.m2/repository
4343
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
version: v2026.6.14
1818
sha256: 96ae1ef7b00a6ebbbec23ba1016d6e722f5e904966272f621d15326429e90d53
1919
- name: Cache local Maven repository
20-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
20+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
2121
with:
2222
path: ~/.m2/repository
2323
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/bump-api-diff-baseline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
version: v2026.6.14
3939
sha256: 96ae1ef7b00a6ebbbec23ba1016d6e722f5e904966272f621d15326429e90d53
4040
- name: Cache local Maven repository
41-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
41+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
4242
with:
4343
path: ~/.m2/repository
4444
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
java-version: "25"
3333

3434
- name: Cache Maven repository
35-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
35+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
3636
with:
3737
path: ~/.m2/repository
3838
key: ${{ runner.os }}-maven-codeql-${{ hashFiles('**/pom.xml') }}

.github/workflows/detect-api-changes.yml

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
REPO: ${{ github.repository }}
3131
run: |
3232
MARKER="<!-- api-change-detector -->"
33+
BREAKING_LABEL="breaking-api-change"
3334
3435
api_files=$(gh api "repos/${REPO}/pulls/${PR_NUMBER}/files" --paginate \
3536
--jq '.[] | select(.filename | startswith("docs/apidiffs/current_vs_latest/")) | .filename')
@@ -40,6 +41,7 @@ jobs:
4041
if [[ -z "$api_files" ]]; then
4142
echo "No API diff files changed."
4243
gh pr edit "$PR_NUMBER" --repo "$REPO" --remove-label "api-change" 2>/dev/null || true
44+
gh pr edit "$PR_NUMBER" --repo "$REPO" --remove-label "$BREAKING_LABEL" 2>/dev/null || true
4345
if [[ -n "$comment_id" ]]; then
4446
gh api --method DELETE "repos/${REPO}/issues/comments/${comment_id}"
4547
fi
@@ -57,7 +59,44 @@ jobs:
5759
| sort \
5860
| sed 's/^/- /')
5961
60-
body=$(cat <<EOF
62+
HEAD_SHA=$(gh api "repos/${REPO}/pulls/${PR_NUMBER}" --jq .head.sha)
63+
breaking_files=()
64+
while IFS= read -r file; do
65+
[[ -z "$file" ]] && continue
66+
content=$(gh api \
67+
-H "Accept: application/vnd.github.raw" \
68+
"repos/${REPO}/contents/${file}?ref=${HEAD_SHA}")
69+
if grep -Eq '^[[:space:]]*(\*\*\*!|---!|\+\+\+!)' <<<"$content"; then
70+
breaking_files+=("$file")
71+
fi
72+
done <<<"$api_files"
73+
74+
if [[ ${#breaking_files[@]} -gt 0 ]]; then
75+
gh pr edit "$PR_NUMBER" --repo "$REPO" --add-label "$BREAKING_LABEL"
76+
breaking_modules=$(printf '%s\n' "${breaking_files[@]}" \
77+
| sed 's|docs/apidiffs/current_vs_latest/||' \
78+
| sed 's|\.txt$||' \
79+
| sort \
80+
| sed 's/^/- /')
81+
body=$(cat <<EOF
82+
${MARKER}
83+
## :warning: Breaking API changes detected — maintainer review required
84+
85+
This PR modifies the published API diff for the following module(s):
86+
87+
${modules}
88+
89+
The committed API diff contains breaking-change markers for:
90+
91+
${breaking_modules}
92+
93+
Please review the changes in \`docs/apidiffs/current_vs_latest/\` carefully before approving.
94+
EOF
95+
)
96+
else
97+
gh pr edit "$PR_NUMBER" --repo "$REPO" --remove-label "$BREAKING_LABEL" 2>/dev/null || true
98+
99+
body=$(cat <<EOF
61100
${MARKER}
62101
## :warning: API changes detected — maintainer review required
63102
@@ -67,7 +106,8 @@ jobs:
67106
68107
Please review the changes in \`docs/apidiffs/current_vs_latest/\` carefully before approving.
69108
EOF
70-
)
109+
)
110+
fi
71111
72112
if [[ -n "$comment_id" ]]; then
73113
gh api --method PATCH "repos/${REPO}/issues/comments/${comment_id}" \

.github/workflows/generate-protobuf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
version: v2026.6.14
2424
sha256: 96ae1ef7b00a6ebbbec23ba1016d6e722f5e904966272f621d15326429e90d53
2525
- name: Cache local Maven repository
26-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
26+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
2727
with:
2828
path: ~/.m2/repository
2929
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/java-version-matrix-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
sha256: 96ae1ef7b00a6ebbbec23ba1016d6e722f5e904966272f621d15326429e90d53
3838

3939
- name: Cache local Maven repository
40-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
40+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
4141
with:
4242
path: ~/.m2/repository
4343
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/jmx-exporter-compatibility.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
sha256: 96ae1ef7b00a6ebbbec23ba1016d6e722f5e904966272f621d15326429e90d53
2929
working_directory: .mise/envs/jmx-exporter
3030
- name: Cache local Maven repository
31-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
31+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
3232
with:
3333
path: ~/.m2/repository
3434
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/micrometer-compatibility.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
sha256: 96ae1ef7b00a6ebbbec23ba1016d6e722f5e904966272f621d15326429e90d53
3737
working_directory: .mise/envs/micrometer
3838
- name: Cache local Maven repository
39-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
39+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
4040
with:
4141
path: ~/.m2/repository
4242
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/multi-version-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
java-version: ${{ matrix.java }}
2828

2929
- name: Cache local Maven repository
30-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
30+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
3131
with:
3232
path: ~/.m2/repository
3333
key: ${{ runner.os }}-maven-java${{ matrix.java }}-${{ hashFiles('**/pom.xml') }}

0 commit comments

Comments
 (0)