diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index 3a0204e..dbe5388 100644 --- a/.github/workflows/ci-docs.yml +++ b/.github/workflows/ci-docs.yml @@ -2,6 +2,10 @@ name: CI - Docs build check on: push: + tags: + - "draft*" + - "rc*" + - "v*" branches: - main - draft diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 208c0a7..1d861d5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -name: Build & publish docs (rc + release) +name: Build & publish on: push: @@ -14,7 +14,6 @@ permissions: env: MKDOCS_CONFIG: mkdocs/mkdocs.yml MKDOCS_STRICT: ${{ vars.MKDOCS_STRICT || 'true' }} - SKIP_DOCX: f${{ vars.SKIP_DOCX || 'false' }}e jobs: publish: @@ -36,12 +35,9 @@ jobs: set -euo pipefail pip install -r mkdocs/requirements.txt - # Install pandoc if not present - if [ "${SKIP_DOCX}" != "true" ]; then - if ! command -v pandoc >/dev/null 2>&1; then - sudo apt-get update - sudo apt-get install -y pandoc - fi + if ! command -v pandoc >/dev/null 2>&1; then + sudo apt-get update + sudo apt-get install -y pandoc fi - name: Build docs (normal + offline, strict gate) @@ -79,7 +75,6 @@ jobs: OFFLINE=true mkdocs build "${FLAGS[@]}" -f "${MKDOCS_CONFIG}" -d "${SITE_OFFLINE}" - name: Export docx - if: env.SKIP_DOCX != 'true' run: | set -euo pipefail @@ -131,25 +126,26 @@ jobs: - name: Publish prerelease if: startsWith(github.ref_name, 'rc') || startsWith(github.ref_name, 'draft') - uses: softprops/action-gh-release@v2 + uses: ncipollo/release-action@v1 with: - prerelease: true + allowUpdates: true + artifacts: ${{ runner.temp }}/mkdocs_out/site_offline/${{ github.ref_name }}.zip,${{ runner.temp }}/pandoc/${{ github.ref_name }}-${{ env.SHORT_SHA }}.docx + bodyFile: ${{ runner.temp }}/release-notes.md name: ${{ github.ref_name }} - tag_name: ${{ github.ref_name }} - body_path: ${{ runner.temp }}/release-notes.md - files: | - ${{ runner.temp }}/mkdocs_out/site_offline/${{ github.ref_name }}.zip - ${{ runner.temp }}/pandoc/${{ github.ref_name }}-${{ env.SHORT_SHA }}.docx + prerelease: true + replacesArtifacts: true + tag: ${{ github.ref_name }} - name: Publish release if: startsWith(github.ref_name, 'v') - uses: softprops/action-gh-release@v2 + uses: ncipollo/release-action@v1 with: + allowUpdates: true + artifacts: ${{ runner.temp }}/mkdocs_out/site_offline/${{ github.ref_name }}.zip,${{ runner.temp }}/pandoc/${{ github.ref_name }}-${{ env.SHORT_SHA }}.docx + bodyFile: ${{ runner.temp }}/release-notes.md name: ${{ github.ref_name }} - tag_name: ${{ github.ref_name }} - body_path: ${{ runner.temp }}/release-notes.md - files: | - ${{ runner.temp }}/mkdocs_out/site_offline/${{ github.ref_name }}.zip + replacesArtifacts: true + tag: ${{ github.ref_name }} - name: Checkout gh-pages branch uses: actions/checkout@v4