Skip to content

Commit 04f811b

Browse files
committed
Merge branch '2.6.x' into 2.7.x
Fix Antora Issue gh-2327
2 parents 2d5432b + 95c03db commit 04f811b

File tree

10 files changed

+33
-148
lines changed

10 files changed

+33
-148
lines changed

.github/actions/algolia-config.json

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

.github/actions/algolia-deploy.sh

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

.github/actions/algolia-docsearch-scraper.sh

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

.github/actions/dispatch.sh

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

.github/workflows/algolia-index.yml

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

.github/workflows/antora-generate.yml

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

.github/workflows/deploy-docs.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Deploy Docs
2+
on:
3+
push:
4+
branches-ignore: [ gh-pages ]
5+
tags: '**'
6+
repository_dispatch:
7+
types: request-build-reference # legacy
8+
#schedule:
9+
#- cron: '0 10 * * *' # Once per day at 10am UTC
10+
workflow_dispatch:
11+
permissions: read-all
12+
jobs:
13+
build:
14+
runs-on: ubuntu-latest
15+
if: github.repository_owner == 'spring-projects'
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v3
19+
with:
20+
ref: docs-build
21+
fetch-depth: 1
22+
- name: Dispatch (partial build)
23+
if: github.ref_type == 'branch'
24+
env:
25+
GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
26+
run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) -f build-refname=${{ github.ref_name }}
27+
- name: Dispatch (full build)
28+
if: github.ref_type == 'tag'
29+
env:
30+
GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
31+
run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD)

.github/workflows/deploy-reference.yml

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

buildSrc/src/main/groovy/io/spring/gradle/convention/JacocoPlugin.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class JacocoPlugin implements Plugin<Project> {
3434
project.tasks.check.dependsOn project.tasks.jacocoTestReport
3535

3636
project.jacoco {
37-
toolVersion = '0.8.2'
37+
toolVersion = '0.8.7'
3838
}
3939
}
4040
}

buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginITest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void multiModuleApi() throws Exception {
2828
.build();
2929
assertThat(result.task(":api").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
3030
File allClasses = new File(testKit.getRootDir(), "build/api/allclasses-noframe.html");
31-
File index = new File(testKit.getRootDir(), "build/api/allclasses.html");
31+
File index = new File(testKit.getRootDir(), "build/api/allclasses-index.html");
3232
File listing = allClasses.exists() ? allClasses : index;
3333
String listingText = FileUtils.readFileToString(listing);
3434
assertThat(listingText).contains("sample/Api.html");

0 commit comments

Comments
 (0)