ci: fix inconsistent indentation
PATCH 1/1 ci: fix inconsistent indentation
From: Adrian Moennich <[email protected]>
---
Fix inconsistent yaml indentation
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-823%2FThiefMaster%2Fpatch-1-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-823/ThiefMaster/patch-1-v1
Pull-Request: https://github.com/git/git/pull/823
.github/workflows/main.yml | 56 +++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-)
.github/workflows/main.yml +28 -28
@@ -7,34 +7,34 @@ env: jobs: ci-config: - runs-on: ubuntu-latest - outputs: - enabled: ${{ steps.check-ref.outputs.enabled }} - steps: - - name: try to clone ci-config branch - continue-on-error: true - run: | - git -c protocol.version=2 clone \ - --no-tags \ - --single-branch \ - -b ci-config \ - --depth 1 \ - --no-checkout \ - --filter=blob:none \ - https://github.com/${{ github.repository }} \ - config-repo && - cd config-repo && - git checkout HEAD -- ci/config - - id: check-ref - name: check whether CI is enabled for ref - run: | - enabled=yes - if test -x config-repo/ci/config/allow-ref && - ! config-repo/ci/config/allow-ref '${{ github.ref }}' - then - enabled=no - fi - echo "::set-output name=enabled::$enabled" + runs-on: ubuntu-latest + outputs: + enabled: ${{ steps.check-ref.outputs.enabled }} + steps: + - name: try to clone ci-config branch + continue-on-error: true + run: | + git -c protocol.version=2 clone \ + --no-tags \ + --single-branch \ + -b ci-config \ + --depth 1 \ + --no-checkout \ + --filter=blob:none \ + https://github.com/${{ github.repository }} \ + config-repo && + cd config-repo && + git checkout HEAD -- ci/config + - id: check-ref + name: check whether CI is enabled for ref + run: | + enabled=yes + if test -x config-repo/ci/config/allow-ref && + ! config-repo/ci/config/allow-ref '${{ github.ref }}' + then + enabled=no + fi + echo "::set-output name=enabled::$enabled" windows-build: needs: ci-config
base-commit: dc04167d378fb29d30e1647ff6ff51dd182bc9a3
Signature · 1 line
gitgitgadget
Quoted 2 lines · Adrian via GitGitGadget
From: Adrian Moennich <[email protected]>
Here is a good place to explain what you consider consistent and inconsistent ...
Quoted 2 lines
Signed-off-by Adrian Moennich <[email protected]>---
... because ...
.github/workflows/main.yml env: · line 14
Quoted 7 lines
jobs:
ci-config:.github/workflows/main.yml +0
-5- runs-on: ubuntu-latest - outputs: - enabled: ${{ steps.check-ref.outputs.enabled }} - steps: - - name: try to clone ci-config branch
... the above is being very consistent. All the direct children of jobs.ci-config like runs-on, outputs and steps are (1) indented more than its parent (i.e. jobs.ci-config) and (2) indented by the same amount relative to their parent (i.e. 4 spaces).
Apparently, that is enough "consistency" CI system wants to see. If you want to impose extra "consistency", that is fine, but you'd need to be more explicit about it. Perhaps like
All other parts of this file indent children from their parent by exactly two spaces, but direct children of "jobs.ci-config" hierarchy were indented by four spaces. While it is not an error, let's be more consistent.
or something?
Quoted 56 lines
.github/workflows/main.yml +28
-23- continue-on-error: true - run: | - git -c protocol.version=2 clone \ - --no-tags \ - --single-branch \ - -b ci-config \ - --depth 1 \ - --no-checkout \ - --filter=blob:none \ - https://github.com/${{ github.repository }} \ - config-repo && - cd config-repo && - git checkout HEAD -- ci/config - - id: check-ref - name: check whether CI is enabled for ref - run: | - enabled=yes - if test -x config-repo/ci/config/allow-ref && - ! config-repo/ci/config/allow-ref '${{ github.ref }}' - then - enabled=no - fi - echo "::set-output name=enabled::$enabled" + runs-on: ubuntu-latest + outputs: + enabled: ${{ steps.check-ref.outputs.enabled }} + steps: + - name: try to clone ci-config branch + continue-on-error: true + run: | + git -c protocol.version=2 clone \ + --no-tags \ + --single-branch \ + -b ci-config \ + --depth 1 \ + --no-checkout \ + --filter=blob:none \ + https://github.com/${{ github.repository }} \ + config-repo && + cd config-repo && + git checkout HEAD -- ci/config + - id: check-ref + name: check whether CI is enabled for ref + run: | + enabled=yes + if test -x config-repo/ci/config/allow-ref && + ! config-repo/ci/config/allow-ref '${{ github.ref }}' + then + enabled=no + fi + echo "::set-output name=enabled::$enabled" windows-build: needs: ci-configbase-commit:
dc04167d378fb29d30e1647ff6ff51dd182bc9a3
PATCH v2 1/1 ci: fix inconsistent indentation
In reply to Adrian via GitGitGadgetFrom: Adrian Moennich <[email protected]>
While YAML allows different indentation styles as long as each block is consistent, it is rather unusual to mix different indentations in a single file. Therefor I unified the file to use two-space indentation everywhere.
---
Fix inconsistent yaml indentation
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-823%2FThiefMaster%2Fpatch-1-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-823/ThiefMaster/patch-1-v2
Pull-Request: https://github.com/git/git/pull/823
Range-diff vs v1:
1: 5301e3842e ! 1: d398122a6a ci: fix inconsistent indentation
@@ Metadata
## Commit message ##
ci: fix inconsistent indentation
+ While YAML allows different indentation styles as long as each block is
+ consistent, it is rather unusual to mix different indentations in a
+ single file. Therefor I unified the file to use two-space indentation
+ everywhere.
+
## .github/workflows/main.yml ##
.github/workflows/main.yml | 56 +++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-)
.github/workflows/main.yml +28 -28
@@ -7,34 +7,34 @@ env: jobs: ci-config: - runs-on: ubuntu-latest - outputs: - enabled: ${{ steps.check-ref.outputs.enabled }} - steps: - - name: try to clone ci-config branch - continue-on-error: true - run: | - git -c protocol.version=2 clone \ - --no-tags \ - --single-branch \ - -b ci-config \ - --depth 1 \ - --no-checkout \ - --filter=blob:none \ - https://github.com/${{ github.repository }} \ - config-repo && - cd config-repo && - git checkout HEAD -- ci/config - - id: check-ref - name: check whether CI is enabled for ref - run: | - enabled=yes - if test -x config-repo/ci/config/allow-ref && - ! config-repo/ci/config/allow-ref '${{ github.ref }}' - then - enabled=no - fi - echo "::set-output name=enabled::$enabled" + runs-on: ubuntu-latest + outputs: + enabled: ${{ steps.check-ref.outputs.enabled }} + steps: + - name: try to clone ci-config branch + continue-on-error: true + run: | + git -c protocol.version=2 clone \ + --no-tags \ + --single-branch \ + -b ci-config \ + --depth 1 \ + --no-checkout \ + --filter=blob:none \ + https://github.com/${{ github.repository }} \ + config-repo && + cd config-repo && + git checkout HEAD -- ci/config + - id: check-ref + name: check whether CI is enabled for ref + run: | + enabled=yes + if test -x config-repo/ci/config/allow-ref && + ! config-repo/ci/config/allow-ref '${{ github.ref }}' + then + enabled=no + fi + echo "::set-output name=enabled::$enabled" windows-build: needs: ci-config
base-commit: 675a4aaf3b226c0089108221b96559e0baae5de9
Signature · 1 line
gitgitgadget
Thanks.