diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-08-31 15:49:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-31 15:49:46 -0700 |
| commit | 1a753720c3c416ed53e985ace9f8f1232118c516 (patch) | |
| tree | 01c540d4e5916243e378ee95965fb83a7d2a10ce /.github/workflows | |
| parent | po: add missing letter for French message (diff) | |
| parent | ci: fix inconsistent indentation (diff) | |
| download | tgif-1a753720c3c416ed53e985ace9f8f1232118c516.tar.xz | |
Merge branch 'am/ci-wsfix'
Aesthetic fix to a CI configuration file.
* am/ci-wsfix:
ci: fix inconsistent indentation
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/main.yml | 56 |
1 files 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 |