Skip to content

Commit 9d851ec

Browse files
committed
Merge remote-tracking branch 'origin/master' into copilot/add-jspecify-annotations
2 parents 21261ed + ee007b0 commit 9d851ec

File tree

4 files changed

+106
-104
lines changed

4 files changed

+106
-104
lines changed

.github/workflows/ci-doctor.lock.yml

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/ci-doctor.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ permissions: read-all
1919
network: defaults
2020

2121
safe-outputs:
22+
noop:
23+
report-as-issue: false
2224
create-issue:
2325
title-prefix: "${{ github.workflow }}"
2426
labels: [automation, ci]

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def getDevelopmentVersion() {
9090
gitRevParse.waitForProcessOutput(gitRevParseOutput, gitRevParseError)
9191
def branchName = gitRevParseOutput.toString().trim().replaceAll('[/\\\\]', '-')
9292

93-
return makeDevelopmentVersion(["0.0.0", branchName, "SNAPSHOT"])
93+
return makeDevelopmentVersion(["0.0.0", sanitizedBranchName, "SNAPSHOT"])
9494
}
9595

9696
def reactiveStreamsVersion = '1.0.3'

0 commit comments

Comments
 (0)