Merge branch '1.18'

Change-Id: I37c359289dcd957fbc964a35fab381a047f7d04a

1 files changed, 0 insertions, 43 deletions

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d286fcc22..d7be93f07 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -218,49 +218,6 @@ jobs:
         name: qbs-windows-${{ github.run_id }}.zip
         path: release/qbs-windows-${{ github.run_id }}.zip
 
-  build-windows-with-docker:
-    name: Build on Windows (Docker)
-    runs-on: windows-latest
-    timeout-minutes: 45
-    env:
-      WITH_TESTS: 0
-      QT_ASSUME_STDERR_HAS_CONSOLE: 1
-      CLCACHE_DIR: C:\.ccache
-    steps:
-    - uses: actions/checkout@v1
-    - name: Create .ccache dir
-      run: mkdir -p ~/.ccache
-      shell: bash
-    - name: prepare timestamp
-      id: get-timestamp
-      run: echo ::set-output name=timestamp::$(date -u +"%Y-%m-%dT%H:%M:%SZ")
-      shell: bash
-    - name: clcache cache files
-      uses: actions/cache@v2
-      with:
-        path: ~/.ccache
-        key: ${{ runner.os }}-msvc-docker-clcache-${{ steps.get-timestamp.outputs.timestamp }}
-        restore-keys: ${{ runner.os }}-msvc-docker-clcache-
-    - name: Pull the Windows Image
-      run: docker-compose pull windows
-    - name: Print clcache stats
-      run: docker-compose run --rm windows clcache -s
-    - name: Build Qbs
-      run: >
-        docker-compose run --rm windows qbs build
-        -p dist
-        qbs.buildVariant:release
-        modules.cpp.compilerWrapper:clcache
-        modules.qbsbuildconfig.enableBundledQt:true
-        modules.qbsbuildconfig.enableProjectFileUpdates:true
-        modules.qbsbuildconfig.enableUnitTests:true
-        modules.cpp.treatWarningsAsErrors:true
-        project.withDocumentation:true
-        config:release-64 profile:qt64
-        config:release profile:qt
-    - name: Print clcache stats
-      run: docker-compose run --rm windows clcache -s
-
   test-linux:
     name: ${{ matrix.config.name }}
     runs-on: ubuntu-latest