-
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 http-proxy
- Loading branch information
Showing
6 changed files
with
265 additions
and
206 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
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 |
|---|---|---|
| @@ -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: | ||
|
|
@@ -112,7 +101,46 @@ jobs: | |
| commit-message: 'Update ‘${{ env.RELEASE }}’ docs for ${{ github.event.inputs.dita-ot-version }}' | ||
| committer: 'DITA-OT Bot <[email protected]>' | ||
| signoff: true | ||
| token: ${{ secrets.COMMITTER_TOKEN }} | ||
| token: ${{ secrets.DOCS_RELEASE_TOKEN }} | ||
| path: website | ||
| labels: | | ||
| release-updates | ||
| update-ci: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Parse arguments | ||
| run: | | ||
| if [[ -n "${{ github.event.client_payload.dita_ot_version }}" ]]; then | ||
| echo "VERSION=${{ github.event.client_payload.dita_ot_version }}" >> $GITHUB_ENV | ||
| 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: | ||
| cmd: yq -i '.jobs.deploy.env.DITA_OT_VERSION = "${{ env.VERSION }}"' '.github/workflows/release.yml' | ||
| - name: Update GitHub Actions render action | ||
| 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@v5 | ||
| with: | ||
| branch: feature/update-github-actions-${{ env.VERSION }} | ||
| title: 'Update docs GitHub Actions for ${{ env.VERSION }}' | ||
| body: | | ||
| Update docs GitHub Actions for ${{ env.VERSION }}. | ||
| commit-message: 'Update GitHub Actions for ${{ env.VERSION }}' | ||
| committer: 'DITA-OT Bot <[email protected]>' | ||
| signoff: true | ||
| token: ${{ secrets.DOCS_RELEASE_TOKEN }} | ||
| labels: | | ||
| release-updates | ||
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
Oops, something went wrong.