Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into jmx-metric-insight
Browse files Browse the repository at this point in the history
  • Loading branch information
trask committed Oct 31, 2022
2 parents 252be45 + 6bee632 commit 239b42a
Show file tree
Hide file tree
Showing 660 changed files with 7,640 additions and 4,385 deletions.
4 changes: 4 additions & 0 deletions .github/component_owners.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# this file is used by .github/workflows/assign-reviewers.yml
components:
"*.md":
- theletterf
6 changes: 6 additions & 0 deletions .github/dependabot-symlinks/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
This directory and the two symlinks in it are used by the
[dependabot configuration](../dependabot.yml), because we can't include the root directory
in the dependabot scanning since then it will pick up all of the old library versions that we
intentionally compile and test against.

See https://github.com/dependabot/dependabot-core/issues/4364.
1 change: 1 addition & 0 deletions .github/dependabot-symlinks/build.gradle.kts
1 change: 1 addition & 0 deletions .github/dependabot-symlinks/settings.gradle.kts
9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@ updates:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
# need to scope gradle dependency updates down in this repo because most of the instrumentations
# intentionally test against old library versions
directory: "/.github/dependabot-symlinks"
rebase-strategy: "disabled"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/"
allow:
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/generate-release-contributors.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ query($q: String!, $endCursor: String) {
}
}
' --jq '.data.search.edges.[].node.body' \
| grep -oE "#[0-9]{4,}|$GITHUB_REPOSITORY/issues/[0-9]{4,}" \
| grep -oE "#[0-9]{4,}$|#[0-9]{4,}[^0-9<]|$GITHUB_REPOSITORY/issues/[0-9]{4,}" \
| grep -oE "[0-9]{4,}" \
| xargs -I{} gh issue view {} --json 'author,url' --jq '[.author.login,.url]' \
| grep -v '/pull/' \
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/get-version.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash -e

grep -Po "val stableVersion = \"\K[0-9]+.[0-9]+.0" version.gradle.kts
grep -Po "val stableVersion = \"\K[0-9]+.[0-9]+.[0-9]+" version.gradle.kts
9 changes: 7 additions & 2 deletions .github/scripts/markdown-link-check-config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
{
"retryOn429": true,
"aliveStatusCodes": [
"ignorePatterns" : [
{
"pattern" : "^https://kotlinlang\\.org/docs/coroutines-overview\\.html$"
}
],
"retryOn429" : true,
"aliveStatusCodes" : [
200,
403
]
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/assign-reviewers.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# assigns reviewers to pull requests in a similar way as CODEOWNERS, but doesn't require reviewers
# to have write access to the repository
# see .github/component_owners.yaml for the list of components and their owners
name: Assign reviewers

on:
# pull_request_target is needed instead of just pull_request
# because repository write permission is needed to assign reviewers
pull_request_target:

jobs:
assign-reviewers:
runs-on: ubuntu-latest
steps:
- uses: trask/component-owners@main
with:
# this repository is using this action to request doc review
assign-owners: false
2 changes: 1 addition & 1 deletion .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
commit=$(gh pr view $NUMBER --json mergeCommit --jq .mergeCommit.oid)
title=$(gh pr view $NUMBER --json title --jq .title)
branch="backport-${NUMBER}-to-${GITHUB_REF_NAME//\//-}"
branch="opentelemetrybot/backport-${NUMBER}-to-${GITHUB_REF_NAME//\//-}"
git cherry-pick $commit
git push origin HEAD:$branch
Expand Down
Loading

0 comments on commit 239b42a

Please sign in to comment.