Skip to content

Commit e02082e

Browse files
authored
Merge branch 'main' into spring-kafka-update
2 parents f82a3b9 + fc52627 commit e02082e

File tree

81 files changed

+423
-406
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+423
-406
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# See https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md
2+
# and https://github.com/DavidAnson/markdownlint-cli2
3+
4+
config:
5+
ul-style: false
6+
line-length: false
7+
no-duplicate-heading:
8+
siblings_only: true
9+
ol-prefix:
10+
style: ordered
11+
no-inline-html: false
12+
fenced-code-language: false
13+
no-trailing-punctuation:
14+
punctuation: ".,;:" # allowing exclamation points and question marks at end of sentences
15+
16+
ignores:
17+
- "**/build/**"
18+
- "CHANGELOG.md"
19+
- "licenses/licenses.md"

.github/config/lychee.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Lychee configuration file
2-
# See https://lychee.cli.rs/config/
2+
# See https://lychee.cli.rs/guides/config/
33

44
timeout = 30
55
retry_wait_time = 5

.github/config/markdownlint.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/repository-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ private admin repo.
1414
- `GRADLE_PUBLISH_KEY` - owned by [@trask](https://github.com/trask)
1515
- `GRADLE_PUBLISH_SECRET` - owned by [@trask](https://github.com/trask)
1616
- `NVD_API_KEY` - stored in OpenTelemetry-Java 1Password
17-
- Generated at https://nvd.nist.gov/developers/request-an-api-key
17+
- Generated at <https://nvd.nist.gov/developers/request-an-api-key>
1818
- Key is associated with [@trask](https://github.com/trask)'s gmail address
1919
- `SONATYPE_KEY` - owned by [@trask](https://github.com/trask)
2020
- `SONATYPE_USER` - owned by [@trask](https://github.com/trask)
Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
name: Auto license report
22
on:
3-
pull_request:
4-
types:
5-
- opened
6-
- synchronize
3+
push:
4+
branches:
5+
- 'renovate/**/*'
76

87
concurrency:
9-
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
8+
group: ${{ github.workflow }}-${{ github.ref }}
109
cancel-in-progress: true
1110

1211
permissions:
1312
contents: read
1413

1514
jobs:
16-
check:
17-
if: ${{ github.event.pull_request.draft == false }}
15+
auto-license-report:
16+
permissions:
17+
contents: write
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
20+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2121

2222
- name: Free disk space
2323
run: .github/scripts/gha-free-disk-space.sh
@@ -33,26 +33,16 @@ jobs:
3333
with:
3434
cache-read-only: true
3535

36-
- name: Check out PR branch
37-
env:
38-
GH_TOKEN: ${{ github.token }}
39-
run: gh pr checkout ${{ github.event.pull_request.number }}
36+
- name: Use CLA approved bot
37+
run: .github/scripts/use-cla-approved-bot.sh
4038

4139
- name: Update license report
4240
run: ./gradlew generateLicenseReport --no-build-cache
4341

44-
- id: create-patch
45-
name: Create patch file
42+
- name: Commit and push if there are changes
4643
run: |
47-
git add -N --ignore-removal licenses
48-
git diff > patch
49-
if [ -s patch ]; then
50-
echo "exists=true" >> "$GITHUB_OUTPUT"
44+
git add licenses
45+
if ! git diff --cached --quiet; then
46+
git commit -m "Update license report"
47+
git push
5148
fi
52-
53-
- name: Upload patch file
54-
if: steps.create-patch.outputs.exists == 'true'
55-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
56-
with:
57-
path: patch
58-
name: patch

.github/workflows/auto-spotless.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

.github/workflows/auto-update-otel-sdk.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
latest-version: ${{ steps.check-versions.outputs.latest-version }}
1818
already-opened: ${{ steps.check-versions.outputs.already-opened }}
1919
steps:
20-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
20+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2121

2222
- id: check-versions
2323
name: Check versions
@@ -55,7 +55,7 @@ jobs:
5555
needs:
5656
- check-versions
5757
steps:
58-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
58+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
5959

6060
- name: Update version
6161
env:
@@ -84,7 +84,7 @@ jobs:
8484
- name: Use CLA approved bot
8585
run: .github/scripts/use-cla-approved-bot.sh
8686

87-
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
87+
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
8888
id: otelbot-token
8989
with:
9090
app-id: ${{ vars.OTELBOT_APP_ID }}

.github/workflows/auto-update-pull-request.yml

Lines changed: 0 additions & 107 deletions
This file was deleted.

.github/workflows/backport.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ jobs:
2121
exit 1
2222
fi
2323
24-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
24+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2525
with:
2626
# history is needed to run git cherry-pick below
2727
fetch-depth: 0
2828

2929
- name: Use CLA approved bot
3030
run: .github/scripts/use-cla-approved-bot.sh
3131

32-
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
32+
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
3333
id: otelbot-token
3434
with:
3535
app-id: ${{ vars.OTELBOT_APP_ID }}

0 commit comments

Comments
 (0)