Merge branch 'am/ci-wsfix'

Aesthetic fix to a CI configuration file.

* am/ci-wsfix:
  ci: fix inconsistent indentation

diff --combined .github/workflows/main.yml
index 44e0fe5839de50425abe385bd156c48b996cff3d,5bd321e5e1e57c3deae5337b6c58281dda3a4ec2..30425404eb3fb8bc66ebf2c16803763f5d1247d0
--- 1/.github/workflows/main.yml
--- 2/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@@ -7,34 -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
@@@ -145,6 -145,13 +145,6 @@@
          ## Unzip and remove the artifact
          unzip artifacts.zip
          rm artifacts.zip
 -    - name: generate Visual Studio solution
 -      shell: powershell
 -      run: |
 -        & .\git-sdk-64-minimal\usr\bin\bash.exe -lc @"
 -          make NDEBUG=1 DEVELOPER=1 vcxproj
 -        "@
 -        if (!$?) { exit(1) }
      - name: download vcpkg artifacts
        shell: powershell
        run: |
@@@ -156,17 -163,6 +156,17 @@@
          Remove-Item compat.zip
      - name: add msbuild to PATH
        uses: microsoft/setup-msbuild@v1.0.0
 +    - name: copy dlls to root
 +      shell: powershell
 +      run: |
 +        & compat\vcbuild\vcpkg_copy_dlls.bat release
 +        if (!$?) { exit(1) }
 +    - name: generate Visual Studio solution
 +      shell: bash
 +      run: |
 +        cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows \
 +        -DIconv_LIBRARY=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows/lib/libiconv.lib -DIconv_INCLUDE_DIR=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows/include \
 +        -DMSGFMT_EXE=`pwd`/git-sdk-64-minimal/mingw64/bin/msgfmt.exe -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON
      - name: MSBuild
        run: msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142
      - name: bundle artifact tar
@@@ -175,6 -171,8 +175,6 @@@
          MSVC: 1
          VCPKG_ROOT: ${{github.workspace}}\compat\vcbuild\vcpkg
        run: |
 -        & compat\vcbuild\vcpkg_copy_dlls.bat release
 -        if (!$?) { exit(1) }
          & git-sdk-64-minimal\usr\bin\bash.exe -lc @"
            mkdir -p artifacts &&
            eval \"`$(make -n artifacts-tar INCLUDE_DLLS_IN_ARTIFACTS=YesPlease ARTIFACTS_DIRECTORY=artifacts 2>&1 | grep ^tar)\"
@@@ -205,7 -203,7 +205,7 @@@
      - name: extract build artifacts
        shell: bash
        run: tar xf artifacts.tar.gz
 -    - name: test (parallel)
 +    - name: test
        shell: powershell
        env:
          MSYSTEM: MINGW64
@@@ -216,19 -214,12 +216,19 @@@
            # Let Git ignore the SDK and the test-cache
            printf '%s\n' /git-sdk-64-minimal/ /test-cache/ >>.git/info/exclude
  
 -          cd t &&
 -          PATH=\"`$PWD/helper:`$PATH\" &&
 -          test-tool.exe run-command testsuite --jobs=10 -V -x --write-junit-xml \
 -                  `$(test-tool.exe path-utils slice-tests \
 -                          ${{matrix.nr}} 10 t[0-9]*.sh)
 +          ci/run-test-slice.sh ${{matrix.nr}} 10
          "@
 +    - name: ci/print-test-failures.sh
 +      if: failure()
 +      shell: powershell
 +      run: |
 +        & .\git-sdk-64-minimal\usr\bin\bash.exe -lc ci/print-test-failures.sh
 +    - name: Upload failed tests' directories
 +      if: failure() && env.FAILED_TEST_ARTIFACTS != ''
 +      uses: actions/upload-artifact@v1
 +      with:
 +        name: failed-tests-windows
 +        path: ${{env.FAILED_TEST_ARTIFACTS}}
    regular:
      needs: ci-config
      if: needs.ci-config.outputs.enabled == 'yes'