Skip to content

Commit 2c88c86

Browse files
committed
Merge branch 'hotfix/4.3.5'
* hotfix/4.3.5: Update README link to bundled plug-ins Prepare 4.3.5 Release Notes stub reorder/rename pdf-themes topics to make them less confusing Bump Docker image version to ”4.3.5“ Bump 'maintenance-version' key to “4.3.5” Bump actions/checkout from 4 to 5 (#633) Bump actions/setup-java from 4 to 5 (#632) Bump lint-staged from 16.1.2 to 16.1.5 (#631) Replace deprecated Ant if with if:set (#630) Bump stylelint-config-recommended from 16.0.0 to 17.0.0 (#628) Bump stylelint from 16.21.0 to 16.23.0 (#627) Bump @prettier/plugin-xml from 3.4.1 to 3.4.2 (#626) Push `reference/markdown` to wiki subrepo Update MDITA syntax details (#624) Add 4.3.4 release date Update GitHub Actions for 4.3.4 (#625)
2 parents 317539c + 44a6602 commit 2c88c86

18 files changed

Lines changed: 241 additions & 337 deletions

.github/actions/render/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ inputs:
66
default: 'master'
77
DITA_OT_VERSION:
88
description: 'DITA-OT version used for rendering'
9-
default: '4.3.3'
9+
default: '4.3.4'
1010
runs:
1111
using: 'composite'
1212
steps:

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Check out docs
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515
- name: Check out website
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v5
1717
with:
1818
repository: dita-ot/website
1919
token: ${{ secrets.COMMITTER_TOKEN }}

.github/workflows/gradle-wrapper-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ jobs:
99
name: 'Validation'
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
1313
- uses: gradle/wrapper-validation-action@v3

.github/workflows/prettier.yml

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

1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2121
with:
2222
# Make sure the actual branch is checked out when running on pull requests
2323
ref: ${{ github.ref }}

.github/workflows/preview.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717
WEBSITE_BRANCH: 'master'
1818
steps:
1919
- name: Check out docs
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2121
- name: Check out website
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v5
2323
with:
2424
repository: dita-ot/website
2525
ref: ${{ env.WEBSITE_BRANCH }}

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
env:
1919
WEBSITE_PLUGIN_BRANCH: 'master'
20-
DITA_OT_VERSION: '4.3.3'
20+
DITA_OT_VERSION: '4.3.4'
2121
steps:
2222
- name: Parse arguments
2323
run: |
@@ -35,20 +35,20 @@ jobs:
3535
echo "TAG=${{ github.event.inputs.docs-tag }}" >> $GITHUB_ENV
3636
fi
3737
- name: Check out docs
38-
uses: actions/checkout@v4
38+
uses: actions/checkout@v5
3939
with:
4040
ref: ${{ env.TAG }}
4141
- name: Set variables
4242
run: |
4343
echo "GITHUB_SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
4444
- name: Set up JDK 17
45-
uses: actions/setup-java@v4
45+
uses: actions/setup-java@v5
4646
with:
4747
distribution: temurin
4848
java-version: 17
4949
cache: 'gradle'
5050
- name: Check out website
51-
uses: actions/checkout@v4
51+
uses: actions/checkout@v5
5252
with:
5353
repository: dita-ot/website
5454
token: ${{ secrets.COMMITTER_TOKEN }}
@@ -120,7 +120,7 @@ jobs:
120120
echo "RELEASE_VERSION=${{ github.event.inputs.dita-ot-version }}" >> $GITHUB_ENV
121121
fi
122122
- name: Check out docs
123-
uses: actions/checkout@v4
123+
uses: actions/checkout@v5
124124
with:
125125
ref: develop
126126
- name: Update GitHub Actions release workflow

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ If you'd like to check whether your changes are formatted correctly, or format t
135135
[4]: https://www.dita-ot.org
136136
[5]: https://github.com/dita-ot/dita-ot
137137
[6]: https://s3-eu-west-1.amazonaws.com/dita-ot/dita-ot-develop.zip
138-
[7]: https://github.com/dita-ot/dita-ot/blob/develop/build.gradle#L206-L217
138+
[7]: https://github.com/dita-ot/dita-ot/blob/develop/build.gradle#L247-L259
139139
[8]: .github/CONTRIBUTING.md
140140
[9]: https://github.com/dita-ot/docs/wiki/Coding-guidelines
141141
[10]: https://github.com/dita-ot/docs/wiki/Git-workflow#best-practices

0 commit comments

Comments
 (0)