From 3846201fbbb021380fb1b67e88cbfe00dc6c1dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 9 Mar 2022 13:07:46 +0100 Subject: [PATCH] CI: Install MinGW via `egor-tensin/setup-mingw` Scoop install is being problematic since their 0.1.0 release. --- .github/workflows/ci.yml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e708fbf..3bbd1e2a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,14 +69,9 @@ jobs: run: | python -m pip install scons - - name: Windows GCC dependency - if: ${{ matrix.platform == 'windows' }} - # Install GCC from Scoop as the default supplied GCC doesn't work ("Error 1"). - run: | - Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh') - scoop install gcc - g++ --version - gcc --version + - name: Setup MinGW for Windows/MinGW build + if: ${{ matrix.platform == 'windows' && matrix.flags == 'use_mingw=yes' }} + uses: egor-tensin/setup-mingw@v2 - name: Build godot-cpp (debug) run: | @@ -218,13 +213,11 @@ jobs: run: | python -m pip install scons + - name: Setup MinGW for Windows/MinGW build + uses: egor-tensin/setup-mingw@v2 + - name: Build godot-cpp - # Install GCC from Scoop as the default supplied GCC doesn't work ("Error 1"). run: | - Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh') - scoop install gcc - g++ --version - gcc --version scons target=release generate_bindings=yes use_mingw=yes -j $env:NUMBER_OF_PROCESSORS #- name: Build test project (TODO currently not supported, leaving uncommented as a reminder to fix this)