Skip to content

Commit

Permalink
Merge branch 'develop' into hotfix/4.2.3
Browse files Browse the repository at this point in the history
* develop:
  Bump gradle/wrapper-validation-action from 2 to 3 (#557)
  Bump @prettier/plugin-xml from 3.3.1 to 3.4.1 (#555)
  Update GitHub Actions for 4.2.2 (#553)
  Add 4.2.2 release date
  • Loading branch information
infotexture committed May 4, 2024
2 parents 3cfb005 + c10b2c9 commit 0379149
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/actions/render/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ inputs:
default: 'master'
DITA_OT_VERSION:
description: 'DITA-OT version used for rendering'
default: '4.2.1'
default: '4.2.2'
runs:
using: 'composite'
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v2
- uses: gradle/wrapper-validation-action@v3
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
env:
WEBSITE_PLUGIN_BRANCH: 'master'
DITA_OT_VERSION: '4.2.1'
DITA_OT_VERSION: '4.2.2'
steps:
- name: Parse arguments
run: |
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
}
},
"devDependencies": {
"@prettier/plugin-xml": "3.3.1",
"@prettier/plugin-xml": "3.4.1",
"husky": "^9.0.11",
"lint-staged": "15.2.2",
"prettier": "3.2.5",
Expand Down
2 changes: 1 addition & 1 deletion release-notes/index.dita
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<reference id="v4.2.2" outputclass="mark">
<title>DITA-OT <keyword keyref="maintenance-version"/>
<!--<ph outputclass="small text-muted">released mmmm D, yyyy</ph>-->
<ph outputclass="small text-muted">released March 24, 2024</ph>
</title>
<refbody>
<section id="bugs">
Expand Down

0 comments on commit 0379149

Please sign in to comment.