From e1d87c3ca23669258f4700247559c8aab8d69ecf Mon Sep 17 00:00:00 2001 From: Florian Berchtold Date: Wed, 7 Feb 2024 16:20:10 -0800 Subject: [PATCH] yamlfmt --- .github/workflows/ci.yaml | 14 +++++++------- .github/workflows/publish.yaml | 4 ++-- .yamlfmt | 7 ++++++- mkdocs.yml | 2 +- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1f495ee..ac5c447 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,8 +3,8 @@ name: Build docs on: push: branches: - - master - - release/* + - master + - release/* pull_request: workflow_dispatch: inputs: @@ -24,8 +24,8 @@ jobs: steps: - uses: actions/checkout@v4 with: - persist-credentials: false - fetch-depth: 0 + persist-credentials: false + fetch-depth: 0 - name: Build docs run: make build @@ -50,10 +50,10 @@ jobs: # TODO support publishing non-dev versions if: github.event_name == 'push' && github.ref == 'refs/heads/master' env: - PUSH_TOKEN: ${{ secrets.GH_DEPLOY_PUSH_TOKEN }} + PUSH_TOKEN: ${{ secrets.GH_DEPLOY_PUSH_TOKEN }} run: | - make deploy RELEASE=dev ALIAS=master - git push https://$PUSH_TOKEN@github.com/${{ github.repository }} publish + make deploy RELEASE=dev ALIAS=master + git push https://$PUSH_TOKEN@github.com/${{ github.repository }} publish - name: Setup tmate session for debug if: ${{ failure() && github.event_name == 'workflow_dispatch' && inputs.debug_enabled }} diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index fbcbd92..b62bc5f 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -3,7 +3,7 @@ name: Publish docs on: push: branches: - - publish + - publish workflow_dispatch: inputs: debug_enabled: @@ -42,4 +42,4 @@ jobs: uses: mxschmitt/action-tmate@v3 timeout-minutes: 45 with: - limit-access-to-actor: true \ No newline at end of file + limit-access-to-actor: true diff --git a/.yamlfmt b/.yamlfmt index 6ae5f83..20a1b95 100644 --- a/.yamlfmt +++ b/.yamlfmt @@ -1 +1,6 @@ -retain_line_breaks: True +formatter: + type: basic + drop_merge_tag: true + pad_line_comments: 2 # Align with yamllint + scan_folded_as_literal: true + retain_line_breaks: true diff --git a/mkdocs.yml b/mkdocs.yml index 73790e2..2a6ef41 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -74,7 +74,7 @@ plugins: order_by: title - git-revision-date-localized: enable_creation_date: true - # - htmlproofer # https://github.com/manuzhang/mkdocs-htmlproofer-plugin + # - htmlproofer # https://github.com/manuzhang/mkdocs-htmlproofer-plugin markdown_extensions: - abbr