Skip to content

Commit 636b924

Browse files
authored
Merge pull request #56 from cicirello/development
API doc website updates and workflow updates
2 parents bca5019 + 44c4093 commit 636b924

File tree

78 files changed

+170
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+170
-78
lines changed

.github/workflows/api-website.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ jobs:
2727

2828
- name: Tidy up the javadocs
2929
id: tidy
30-
uses: cicirello/javadoc-cleanup@v1.0.1
30+
uses: cicirello/javadoc-cleanup@v1.2.0
3131
with:
32-
base-url-path: https://jpt.cicirello.org/
3332
path-to-root: docs
33+
base-url-path: https://jpt.cicirello.org/
3434

3535
- name: Log javadoc-cleanup output
3636
run: |
@@ -41,6 +41,15 @@ jobs:
4141
if [ $(git status | grep -c "**/*.html") == "0" ]; then
4242
git checkout .
4343
else
44+
if [ $(git status | grep -c "**/member-search-index.*") == "1" ]; then
45+
git checkout -- docs/api/member-search-index.zip
46+
fi
47+
if [ $(git status | grep -c "**/package-search-index.*") == "1" ]; then
48+
git checkout -- docs/api/package-search-index.zip
49+
fi
50+
if [ $(git status | grep -c "**/type-search-index.*") == "1" ]; then
51+
git checkout -- docs/api/type-search-index.zip
52+
fi
4453
git config --global user.name 'Vincent A Cicirello'
4554
git config --global user.email '[email protected]'
4655
git add -A
@@ -61,7 +70,7 @@ jobs:
6170
echo "excluded-count = ${{ steps.sitemap.outputs.excluded-count }}"
6271
6372
- name: Create Pull Request
64-
uses: peter-evans/[email protected].0
73+
uses: peter-evans/[email protected].1
6574
with:
6675
title: "Automated API website updates."
6776
body: >

.github/workflows/maven-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555

5656
- name: Get the upload URL for a release
5757
id: get
58-
uses: bruceadams/[email protected].1
58+
uses: bruceadams/[email protected].2
5959
env:
6060
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6161

docs/api/allclasses-index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<html lang="en">
44
<head>
55
<!-- GitHub action javadoc-cleanup -->
6+
<link rel="canonical" href="https://jpt.cicirello.org/api/allclasses-index.html">
67
<meta name="viewport" content="width=device-width, initial-scale=1">
78
<!-- End javadoc-cleanup block -->
89
<!-- Generated by javadoc -->

docs/api/allclasses.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<html lang="en">
44
<head>
55
<!-- GitHub action javadoc-cleanup -->
6+
<link rel="canonical" href="https://jpt.cicirello.org/api/allclasses.html">
67
<meta name="viewport" content="width=device-width, initial-scale=1">
78
<!-- End javadoc-cleanup block -->
89
<!-- Generated by javadoc -->

docs/api/allpackages-index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<html lang="en">
44
<head>
55
<!-- GitHub action javadoc-cleanup -->
6+
<link rel="canonical" href="https://jpt.cicirello.org/api/allpackages-index.html">
67
<meta name="viewport" content="width=device-width, initial-scale=1">
78
<!-- End javadoc-cleanup block -->
89
<!-- Generated by javadoc -->

docs/api/constant-values.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<html lang="en">
44
<head>
55
<!-- GitHub action javadoc-cleanup -->
6+
<link rel="canonical" href="https://jpt.cicirello.org/api/constant-values.html">
67
<meta name="viewport" content="width=device-width, initial-scale=1">
78
<!-- End javadoc-cleanup block -->
89
<!-- Generated by javadoc -->

docs/api/deprecated-list.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<html lang="en">
44
<head>
55
<!-- GitHub action javadoc-cleanup -->
6+
<link rel="canonical" href="https://jpt.cicirello.org/api/deprecated-list.html">
67
<meta name="viewport" content="width=device-width, initial-scale=1">
78
<!-- End javadoc-cleanup block -->
89
<!-- Generated by javadoc -->

docs/api/help-doc.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<html lang="en">
44
<head>
55
<!-- GitHub action javadoc-cleanup -->
6+
<link rel="canonical" href="https://jpt.cicirello.org/api/help-doc.html">
67
<meta name="viewport" content="width=device-width, initial-scale=1">
78
<!-- End javadoc-cleanup block -->
89
<!-- Generated by javadoc -->

docs/api/index-all.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<html lang="en">
44
<head>
55
<!-- GitHub action javadoc-cleanup -->
6+
<link rel="canonical" href="https://jpt.cicirello.org/api/index-all.html">
67
<meta name="viewport" content="width=device-width, initial-scale=1">
78
<!-- End javadoc-cleanup block -->
89
<!-- Generated by javadoc -->

docs/api/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<html lang="en">
44
<head>
55
<!-- GitHub action javadoc-cleanup -->
6+
<link rel="canonical" href="https://jpt.cicirello.org/api/">
67
<meta name="viewport" content="width=device-width, initial-scale=1">
78
<!-- End javadoc-cleanup block -->
89
<!-- Generated by javadoc -->

0 commit comments

Comments
 (0)