Skip to content

Commit 0fe7fad

Browse files
authored
Merge branch 'main' into jb/native_allocs
2 parents d4b5c06 + 12ecf1d commit 0fe7fad

5 files changed

Lines changed: 14 additions & 7 deletions

File tree

.github/release.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
changelog:
2+
exclude:
3+
labels:
4+
- "no-release-notes"
5+
authors:
6+
- "dependabot"
7+
- "dependabot[bot]"

.github/scripts/release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ fi
6767
if [ "$BRANCH" != "$RELEASE_BRANCH" ]; then
6868
git checkout -b $RELEASE_BRANCH
6969
if ! git diff --quiet; then
70-
git add build.gradle
70+
git add build.gradle.kts
7171
git commit -m "[Automated] Release ${BASE}"
7272
fi
7373
git push $DRYRUN --atomic --set-upstream origin $RELEASE_BRANCH
@@ -82,7 +82,7 @@ fi
8282

8383
CANDIDATE=$(./gradlew printVersion -Psnapshot=false | grep 'Version:' | cut -f2 -d' ')
8484

85-
git add build.gradle
85+
git add build.gradle.kts
8686
git commit -m "[Automated] Bump dev version to ${CANDIDATE}"
8787

8888
git push $DRYRUN --atomic --set-upstream origin $BRANCH

.github/workflows/add-milestone-to-pull-requests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
github-token: ${{secrets.GITHUB_TOKEN}}
2424
script: |
25-
const list = await github.issues.listMilestones({
25+
const list = await github.rest.issues.listMilestones({
2626
owner: context.repo.owner,
2727
repo: context.repo.repo,
2828
state: 'open'
@@ -39,7 +39,7 @@ jobs:
3939
github-token: ${{secrets.GITHUB_TOKEN}}
4040
script: |
4141
// Confusingly, the issues api is used because pull requests are issues
42-
await github.issues.update({
42+
await github.rest.issues.update({
4343
owner: context.repo.owner,
4444
repo: context.repo.repo,
4545
issue_number: ${{ github.event.pull_request.number }},

.github/workflows/increment-milestones-on-tag.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
with:
2626
github-token: ${{secrets.GITHUB_TOKEN}}
2727
script: |
28-
const milestones = await github.paginate(github.issues.listMilestones, {
28+
const milestones = await github.paginate(github.rest.issues.listMilestones, {
2929
owner: context.repo.owner,
3030
repo: context.repo.repo,
3131
state: 'all'
@@ -44,7 +44,7 @@ jobs:
4444
with:
4545
github-token: ${{secrets.GITHUB_TOKEN}}
4646
script: |
47-
await github.issues.updateMilestone({
47+
await github.rest.issues.updateMilestone({
4848
owner: context.repo.owner,
4949
repo: context.repo.repo,
5050
state: 'closed',

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ plugins {
1616
id("com.datadoghq.native-root")
1717
}
1818

19-
version = "1.38.0"
19+
version = "1.39.0"
2020

2121
apply(plugin = "com.dipien.semantic-version")
2222
version = findProperty("ddprof_version") as? String ?: version

0 commit comments

Comments
 (0)