Skip to content

Commit 5d6fa52

Browse files
committed
Merge branch 'release/4.4'
* release/4.4: (61 commits) Move URI dependency tracking info to enhancements Update & remove comments from build file Bump jyjeanne/dita-ot-gradle from 2.3.2 to 2.8.2 (#660) Add entries for recently resolved issues in 4.4 Combine entries for HTML5 passthrough changes Add entries for recently resolved issues in 4.4 List updated docs topics in 4.4 Remove mark highlight from release summary Bump Saxon-HE to version 12.9 Update contributors lists based on latest commits Add 4.4 migration topic & re-use DITA 2.0 info Add previous release dates to 2.0 spec support Move DITA 2.0 updates to spec support for re-use Mark publish.required.cleanup as deprecated Add missing issue link Fix keyref for 2025 new features video topic Edit 2025 video descriptions Push deprecation details to `outputFile.base` #648 Simplify and align deprecation references Mark deprecated elements in HTML output ...
2 parents 2c88c86 + 3f69e52 commit 5d6fa52

40 files changed

Lines changed: 1934 additions & 999 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.4'
9+
default: '4.3.5'
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@v5
14+
uses: actions/checkout@v6
1515
- name: Check out website
16-
uses: actions/checkout@v5
16+
uses: actions/checkout@v6
1717
with:
1818
repository: dita-ot/website
1919
token: ${{ secrets.COMMITTER_TOKEN }}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# https://github.com/marketplace/actions/gradle-wrapper-validation
1+
# https://github.com/gradle/actions/tree/main/wrapper-validation
22

33
name: 'Validate Gradle Wrapper'
44

@@ -9,5 +9,5 @@ jobs:
99
name: 'Validation'
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v5
13-
- uses: gradle/wrapper-validation-action@v3
12+
- uses: actions/checkout@v6
13+
- uses: gradle/actions/wrapper-validation@v5

.github/workflows/prettier.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ jobs:
1717

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

2525
- name: Set Node.js version
26-
uses: actions/setup-node@v4
26+
uses: actions/setup-node@v6
2727
with:
2828
node-version: '22'
2929
cache: 'npm'

.github/workflows/preview.yml

Lines changed: 4 additions & 4 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@v5
20+
uses: actions/checkout@v6
2121
- name: Check out website
22-
uses: actions/checkout@v5
22+
uses: actions/checkout@v6
2323
with:
2424
repository: dita-ot/website
2525
ref: ${{ env.WEBSITE_BRANCH }}
@@ -29,7 +29,7 @@ jobs:
2929
uses: ./.github/actions/render
3030

3131
- name: Cache NPM
32-
uses: actions/cache@v4
32+
uses: actions/cache@v5
3333
with:
3434
path: ~/.npm
3535
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -47,7 +47,7 @@ jobs:
4747
rm -fr build
4848
4949
- name: Cache gems
50-
uses: actions/cache@v4
50+
uses: actions/cache@v5
5151
with:
5252
path: vendor/bundle
5353
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}

.github/workflows/release.yml

Lines changed: 7 additions & 7 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.4'
20+
DITA_OT_VERSION: '4.3.5'
2121
steps:
2222
- name: Parse arguments
2323
run: |
@@ -35,7 +35,7 @@ jobs:
3535
echo "TAG=${{ github.event.inputs.docs-tag }}" >> $GITHUB_ENV
3636
fi
3737
- name: Check out docs
38-
uses: actions/checkout@v5
38+
uses: actions/checkout@v6
3939
with:
4040
ref: ${{ env.TAG }}
4141
- name: Set variables
@@ -48,7 +48,7 @@ jobs:
4848
java-version: 17
4949
cache: 'gradle'
5050
- name: Check out website
51-
uses: actions/checkout@v5
51+
uses: actions/checkout@v6
5252
with:
5353
repository: dita-ot/website
5454
token: ${{ secrets.COMMITTER_TOKEN }}
@@ -57,7 +57,7 @@ jobs:
5757
run: |
5858
curl -sL https://github.com/dita-ot/org.dita-ot.html/archive/refs/heads/${{ env.WEBSITE_PLUGIN_BRANCH }}.zip -o org.dita-ot.html.zip
5959
- name: Cache render DITA-OT
60-
uses: actions/cache@v4
60+
uses: actions/cache@v5
6161
with:
6262
path: dita-ot-${{ env.DITA_OT_VERSION }}
6363
key: ${{ runner.os }}-dita-ot-${{ env.DITA_OT_VERSION }}
@@ -90,7 +90,7 @@ jobs:
9090
DITA_HOME: ${{ github.workspace }}/dita-ot-${{ env.DITA_OT_VERSION }}
9191
RELEASE_DITA_OT: ${{ github.workspace }}/src-dita-ot/dita-ot-${{ env.RELEASE_VERSION }}
9292
- name: Create release PR
93-
uses: peter-evans/create-pull-request@v7
93+
uses: peter-evans/create-pull-request@v8
9494
with:
9595
branch: release/${{ env.RELEASE_VERSION }}
9696
title: 'Update site for ${{ env.RELEASE_VERSION }}'
@@ -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@v5
123+
uses: actions/checkout@v6
124124
with:
125125
ref: develop
126126
- name: Update GitHub Actions release workflow
@@ -132,7 +132,7 @@ jobs:
132132
with:
133133
cmd: yq -i '.inputs.DITA_OT_VERSION.default = "${{ env.RELEASE_VERSION }}"' '.github/actions/render/action.yml'
134134
- name: Create release PR
135-
uses: peter-evans/create-pull-request@v7
135+
uses: peter-evans/create-pull-request@v8
136136
with:
137137
branch: feature/update-github-actions-${{ env.RELEASE_VERSION }}
138138
title: 'Update docs GitHub Actions for ${{ env.RELEASE_VERSION }}'

0 commit comments

Comments
 (0)