Skip to content

Commit

Permalink
Merge remote-tracking branch 'dita-ot/develop' into develop
Browse files Browse the repository at this point in the history
* dita-ot/develop:
  Update docs GitHub Actions for 4.2 (#535)
  • Loading branch information
infotexture committed Feb 11, 2024
2 parents 40fc8de + 541fee3 commit 63d8e93
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 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.1.2'
default: '4.2'
runs:
using: 'composite'
steps:
Expand Down
6 changes: 1 addition & 5 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.1.2'
DITA_OT_VERSION: '4.2'
steps:
- name: Parse arguments
run: |
Expand Down Expand Up @@ -105,7 +105,6 @@ jobs:
path: website
labels: |
release-updates
update-ci:
runs-on: ubuntu-latest
steps:
Expand All @@ -116,12 +115,10 @@ jobs:
else
echo "VERSION=${{ github.event.inputs.dita-ot-version }}" >> $GITHUB_ENV
fi
- name: Check out docs
uses: actions/checkout@v4
with:
ref: develop

- name: Update GitHub Actions release workflow
uses: mikefarah/yq@master
with:
Expand All @@ -130,7 +127,6 @@ jobs:
uses: mikefarah/yq@master
with:
cmd: yq -i '.inputs.DITA_OT_VERSION.default = "${{ env.VERSION }}"' '.github/actions/render/action.yml'

- name: Create release PR
uses: peter-evans/create-pull-request@v6
with:
Expand Down

0 comments on commit 63d8e93

Please sign in to comment.