Skip to content

Commit

Permalink
Update GitHub Actions for 4.1.2 (#512)
Browse files Browse the repository at this point in the history
Signed-off-by: DITA-OT Bot <[email protected]>
Co-authored-by: jelovirt <[email protected]>
  • Loading branch information
jelovirt and jelovirt authored Nov 10, 2023
1 parent a8b8bf7 commit 428bd43
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 17 deletions.
6 changes: 1 addition & 5 deletions .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.0.1'
default: '4.1.2'
runs:
using: 'composite'
steps:
Expand All @@ -23,7 +23,6 @@ runs:
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6

- name: Download website plug-in
shell: bash
run: |
Expand All @@ -33,7 +32,6 @@ runs:
with:
path: dita-ot-${{ inputs.DITA_OT_VERSION }}
key: ${{ runner.os }}-dita-ot-${{ inputs.DITA_OT_VERSION }}

- name: Download stable DITA-OT
shell: bash
run: |
Expand All @@ -44,7 +42,6 @@ runs:
echo "Use cached dita-ot-${{ inputs.DITA_OT_VERSION }}"
fi
dita-ot-${{ inputs.DITA_OT_VERSION }}/bin/dita install org.dita-ot.html.zip --force -v
- name: Get develop DITA-OT ETag
shell: bash
run: |
Expand All @@ -66,7 +63,6 @@ runs:
echo "Use cached dita-ot-develop"
fi
echo "DITA_OT_DEV=$(find dita-ot-develop -name 'dita-ot-*@*' -type d | head -1)" >> $GITHUB_ENV
- name: Run DITA-OT
shell: bash
run: |
Expand Down
13 changes: 1 addition & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# This workflow builds changes to release tag and commits to website repo for release PR

name: Generate website release PR

on:
workflow_dispatch:
inputs:
Expand All @@ -13,13 +12,12 @@ on:
required: true
repository_dispatch:
types: [release]

jobs:
deploy:
runs-on: ubuntu-latest
env:
WEBSITE_PLUGIN_BRANCH: 'master'
DITA_OT_VERSION: '4.0.1'
DITA_OT_VERSION: '4.1.2'
steps:
- name: Parse arguments
run: |
Expand All @@ -34,33 +32,27 @@ jobs:
else
echo "TAG=${{ github.event.inputs.docs-tag }}" >> $GITHUB_ENV
fi
- name: Check out docs
uses: actions/checkout@v4
with:
ref: ${{ env.TAG }}

- name: Set variables
run: |
echo "GITHUB_SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 17

- name: Check out website
uses: actions/checkout@v4
with:
repository: dita-ot/website
token: ${{ secrets.COMMITTER_TOKEN }}
path: website

- name: Download website plug-in
run: |
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
- name: Cache render DITA-OT
uses: actions/cache@v3
with:
Expand All @@ -75,14 +67,12 @@ jobs:
echo "Use cached dita-ot-${{ env.DITA_OT_VERSION }}"
fi
dita-ot-${{ env.DITA_OT_VERSION }}/bin/dita install org.dita-ot.html.zip --force -v
- name: Download release DITA-OT
run: |
curl -sL https://github.com/dita-ot/dita-ot/releases/download/$VERSION/dita-ot-$VERSION.zip -o dita-ot-$VERSION.zip
unzip dita-ot-$VERSION.zip -d src-dita-ot
env:
VERSION: ${{ github.event.inputs.dita-ot-version }}

- name: Run DITA-OT
run: |
./gradlew site \
Expand All @@ -96,7 +86,6 @@ jobs:
WEBSITE_DIR: ${{ github.workspace }}/website
DITA_HOME: ${{ github.workspace }}/dita-ot-${{ env.DITA_OT_VERSION }}
RELEASE_DITA_OT: ${{ github.workspace }}/src-dita-ot/dita-ot-${{ github.event.inputs.dita-ot-version }}

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

0 comments on commit 428bd43

Please sign in to comment.