-
Notifications
You must be signed in to change notification settings - Fork 97
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into hotfix/4.2.4
* develop: 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) Bump husky from 9.0.11 to 9.1.6 (#573) Bump prettier from 3.2.5 to 3.3.3 (#569) Fix typo in `<xsl:apply-templates>` Remove more double-hyphen subcommand syntax refs Remove unresolved keyref to 2024 DITA-OT Day talk Fix duplicate key definitions Remove double-hyphen syntax from subcommand list Clarify that logs are empty if no errors occur Bump lint-staged from 15.2.2 to 15.2.5 (#561) Update GitHub Actions for 4.2.3 (#559) Add author to GHA generated PR commits (#560)
- Loading branch information
Showing
20 changed files
with
321 additions
and
341 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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: | | ||
|
@@ -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 }}' | ||
|
@@ -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 | ||
|
@@ -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: | | ||
|
Oops, something went wrong.