Skip to content

Commit

Permalink
Merge branch 'hotfix/4.2.4'
Browse files Browse the repository at this point in the history
* hotfix/4.2.4: (31 commits)
  Promote .ditaotrc note in local.properties topic
  Implement feedback on .ditaotrc
  Bump prettier from 3.3.3 to 3.4.2 (#582)
  Bump husky from 9.1.6 to 9.1.7 (#580)
  Link from args.rellinks to include.rellinks (#567)
  Add topic on runtime configuration file: .ditaotrc
  Add details on 4551
  Edit configuration.properties for blank keyrefs
  Edit description for 4543
  Add details on recently resolved issues
  Add stub for treat-blank-as-empty config
  Add stub for #4543 in the release notes
  Draft 4.2.4 Release Notes stub
  Bump Docker image version to ”4.2.4“
  Bump 'maintenance-version' key to “4.2.4”
  Bump peter-evans/create-pull-request from 6 to 7 (#575)
  Mark DITA-OT Users as archive & reorder Resources
  Use proper typographic apostrophe
  Add details on custom colors to sample theme file
  Bump lint-staged from 15.2.5 to 15.2.10 (#574)
  ...
  • Loading branch information
infotexture committed Dec 15, 2024
2 parents ea2a795 + 991df8c commit 0e77180
Show file tree
Hide file tree
Showing 29 changed files with 469 additions and 354 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.2'
default: '4.2.3'
runs:
using: 'composite'
steps:
Expand Down
8 changes: 5 additions & 3 deletions .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.2'
DITA_OT_VERSION: '4.2.3'
steps:
- name: Parse arguments
run: |
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
DITA_HOME: ${{ github.workspace }}/dita-ot-${{ env.DITA_OT_VERSION }}
RELEASE_DITA_OT: ${{ github.workspace }}/src-dita-ot/dita-ot-${{ env.RELEASE_VERSION }}
- name: Create release PR
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
branch: release/${{ env.RELEASE_VERSION }}
title: 'Update site for ${{ env.RELEASE_VERSION }}'
Expand All @@ -103,6 +103,7 @@ jobs:
* dita-ot/org.dita-ot.html (${{ env.WEBSITE_PLUGIN_BRANCH }})
commit-message: 'Update ‘${{ env.RELEASE }}’ docs for ${{ env.RELEASE_VERSION }}'
committer: 'DITA-OT Bot <[email protected]>'
author: 'DITA-OT Bot <[email protected]>'
signoff: true
token: ${{ secrets.DOCS_RELEASE_TOKEN }}
path: website
Expand Down Expand Up @@ -131,14 +132,15 @@ jobs:
with:
cmd: yq -i '.inputs.DITA_OT_VERSION.default = "${{ env.RELEASE_VERSION }}"' '.github/actions/render/action.yml'
- name: Create release PR
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
branch: feature/update-github-actions-${{ env.RELEASE_VERSION }}
title: 'Update docs GitHub Actions for ${{ env.RELEASE_VERSION }}'
body: |
Update docs GitHub Actions for ${{ env.RELEASE_VERSION }}.
commit-message: 'Update GitHub Actions for ${{ env.RELEASE_VERSION }}'
committer: 'DITA-OT Bot <[email protected]>'
author: 'DITA-OT Bot <[email protected]>'
signoff: true
token: ${{ secrets.DOCS_RELEASE_TOKEN }}
labels: |
Expand Down
Loading

0 comments on commit 0e77180

Please sign in to comment.