diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 8b9a160d96..1adafd4ca3 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -204,71 +204,3 @@ jobs: cd build make -j$(sysctl -n hw.logicalcpu) test - windows: - name: Windows - - strategy: - fail-fast: false - matrix: - include: - - arch: x86 - - arch: x64 - - runs-on: windows-latest - - steps: - - name: Checkout - uses: actions/checkout@v2 - - # "restore-cache" which is done by "run-vcpkg" uses Windows tar. - # A git clone on windows marks a few files as read-only; when Windows tar - # tries to extract the cache over this folder, it fails, despite the files - # being identical. This failure shows up as an warning in the logs. We - # avoid this by simply removing the read-only mark from the git folder. - # In other words: this is a hack! - # See: https://github.com/lukka/run-vcpkg/issues/61 - - name: Remove read-only flag from vcpkg git folder - shell: powershell - run: | - attrib -r "c:\vcpkg\.git\*.*" /s - - - name: Prepare vcpkg (with cache) - uses: lukka/run-vcpkg@v6 - with: - vcpkgDirectory: 'c:/vcpkg' - doNotUpdateVcpkg: true - vcpkgArguments: 'liblzma libpng lzo zlib' - vcpkgTriplet: '${{ matrix.arch }}-windows-static' - - - name: Install OpenGFX - shell: bash - run: | - mkdir -p "C:/Users/Public/Documents/OpenTTD/baseset" - cd "C:/Users/Public/Documents/OpenTTD/baseset" - - echo "::group::Download OpenGFX" - curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip -o opengfx-all.zip - echo "::endgroup::" - - echo "::group::Unpack OpenGFX" - unzip opengfx-all.zip - echo "::endgroup::" - - rm -f opengfx-all.zip - - - name: Install MSVC problem matcher - uses: ammaraskar/msvc-problem-matcher@master - - - name: Build - uses: lukka/run-cmake@v3 - with: - cmakeListsOrSettingsJson: CMakeListsTxtAdvanced - useVcpkgToolchainFile: true - buildDirectory: '${{ github.workspace }}/build' - cmakeAppendedArgs: ' -GNinja' - - - name: Test - shell: bash - run: | - cd ${GITHUB_WORKSPACE}/build - ctest -C Debug