# [PATCH] ci: fix inconsistent indentation 4 messages from 2020-08-10 to 2020-08-21. Participants: Adrian via GitGitGadget, Junio C Hamano. Thread: https://gitlist.dev/t/54012 ## Adrian via GitGitGadget, 2020-08-10 08:37 Subject: [PATCH] ci: fix inconsistent indentation Message-ID: URL: https://gitlist.dev/e/pull.823.git.git.1597048659983.gitgitgadget%40gmail.com ``` From: Adrian Moennich Signed-off-by: Adrian Moennich --- 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(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 84a5dcff7a..5bd321e5e1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 -- gitgitgadget ``` ## Junio C Hamano, 2020-08-10 16:29 Subject: Re: [PATCH] ci: fix inconsistent indentation Message-ID: URL: https://gitlist.dev/e/xmqq5z9qcvlt.fsf%40gitster.c.googlers.com In-Reply-To: ``` "Adrian via GitGitGadget" writes: > From: Adrian Moennich > Here is a good place to explain what you consider consistent and inconsistent ... > Signed-off-by: Adrian Moennich > --- ... because ... > jobs: > ci-config: > - 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? > - 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 ``` ## Adrian via GitGitGadget, 2020-08-21 09:27 Subject: [PATCH v2] ci: fix inconsistent indentation Message-ID: URL: https://gitlist.dev/e/pull.823.v2.git.git.1598002046754.gitgitgadget%40gmail.com In-Reply-To: ``` From: Adrian Moennich 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. Signed-off-by: Adrian Moennich --- 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. + Signed-off-by: Adrian Moennich ## .github/workflows/main.yml ## .github/workflows/main.yml | 56 +++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 44e0fe5839..30425404eb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 -- gitgitgadget ``` ## Junio C Hamano, 2020-08-21 19:11 Subject: Re: [PATCH v2] ci: fix inconsistent indentation Message-ID: URL: https://gitlist.dev/e/xmqqimdb95m6.fsf%40gitster.c.googlers.com In-Reply-To: ``` Thanks. ```