diff --git a/.github/actions/render/action.yml b/.github/actions/render/action.yml index df87d2fad..02f8c0f4f 100644 --- a/.github/actions/render/action.yml +++ b/.github/actions/render/action.yml @@ -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: @@ -23,7 +23,6 @@ runs: uses: ruby/setup-ruby@v1 with: ruby-version: 2.6 - - name: Download website plug-in shell: bash run: | @@ -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: | @@ -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: | @@ -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: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 25163d5ac..cf1105ecf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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: @@ -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: | @@ -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: @@ -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 \ @@ -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: