mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-05 00:56:58 +08:00
Attempt to fix Windows build error with Antora
See gh-33766
This commit is contained in:
parent
edfc5f66c2
commit
75012c5173
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -72,7 +72,7 @@ jobs:
|
|||
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
|
||||
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
|
||||
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
|
||||
run: ./gradlew build ${{ runner.os == 'Windows' && '--exclude-task antora' || ''}}
|
||||
run: ./gradlew build
|
||||
- name: Send notification
|
||||
uses: ./.github/actions/send-notification
|
||||
if: always()
|
||||
|
|
|
@ -141,8 +141,9 @@ public class AntoraConventions {
|
|||
if (project.getGradle().getStartParameter().getLogLevel() != LogLevel.DEBUG) {
|
||||
antoraExtension.getOptions().add("--quiet");
|
||||
}
|
||||
antoraExtension.getOptions().addAll("--stacktrace");
|
||||
antoraExtension.getOptions().addAll("--log-level", "all");
|
||||
else {
|
||||
antoraExtension.getOptions().addAll("--log-level", "all");
|
||||
}
|
||||
}
|
||||
|
||||
private void configureNodeExtension(Project project, NodeExtension nodeExtension) {
|
||||
|
|
|
@ -294,9 +294,13 @@ def antoraRootAggregateContent = tasks.register("antoraRootAggregateContent", Zi
|
|||
}
|
||||
from(project.configurations.configurationProperties) {
|
||||
eachFile {
|
||||
it.path = it.file.toString()
|
||||
.replaceFirst('/build/(?:classes|resources)/java/main/', '/')
|
||||
.replaceFirst('^.*/([^/]+)/META-INF/(spring-configuration-metadata\\.json)$', 'modules/ROOT/partials/$1/$2')
|
||||
it.path = rootProject
|
||||
.projectDir
|
||||
.toPath()
|
||||
.relativize(it.file.toPath())
|
||||
.toString()
|
||||
.replace('\\', '/')
|
||||
.replaceAll('.*\\/([^\\/]+)\\/build.*', 'modules/ROOT/partials/$1/spring-configuration-metadata.json')
|
||||
}
|
||||
}
|
||||
from(runRemoteSpringApplicationExample) {
|
||||
|
|
Loading…
Reference in New Issue
Block a user