chatterino2
Code Issues

🐛 Fixed windows CI not reporting exitcodes correctly (#2524)

Browse Source
This commit is contained in:
Edgar
2021-04-11 14:46:25 +02:00
committed by GitHub
parent e741744254
commit 8adda902d1
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
+11 -17
View File
@@ -63,7 +63,6 @@ jobs:
version: ${{ matrix.qt-version }} version: ${{ matrix.qt-version }}
# WINDOWS # WINDOWS
- name: Cache conan packages - name: Cache conan packages
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
uses: actions/cache@v2.1.4 uses: actions/cache@v2.1.4
@@ -71,21 +70,25 @@ jobs:
key: ${{ runner.os }}-conan-${{ hashFiles('**/conanfile.txt') }}-20210307 key: ${{ runner.os }}-conan-${{ hashFiles('**/conanfile.txt') }}-20210307
path: C:/.conan/ path: C:/.conan/
- name: Add Conan to path
if: startsWith(matrix.os, 'windows')
run: echo "C:\Program Files\Conan\conan\" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- name: Install dependencies (Windows) - name: Install dependencies (Windows)
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
run: | run: |
choco install conan -y choco install conan -y
refreshenv - name: Enable Developer Command Prompt
shell: cmd if: startsWith(matrix.os, 'windows')
uses: ilammy/msvc-dev-cmd@v1.6.0
- name: Build (Windows) - name: Build (Windows)
if: startsWith(matrix.os, 'windows') && matrix.build-system == 'qmake' if: startsWith(matrix.os, 'windows') && matrix.build-system == 'qmake'
run: | run: |
call "%programfiles(x86)%\Microsoft Visual Studio\%vs_version%\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
mkdir build mkdir build
cd build cd build
"C:\Program Files\Conan\conan\conan.exe" install .. conan install ..
qmake .. qmake ..
set cl=/MP set cl=/MP
nmake /S /NOLOGO nmake /S /NOLOGO
@@ -93,15 +96,13 @@ jobs:
cp release/chatterino.exe Chatterino2/ cp release/chatterino.exe Chatterino2/
echo nightly > Chatterino2/modes echo nightly > Chatterino2/modes
7z a chatterino-windows-x86-64.zip Chatterino2/ 7z a chatterino-windows-x86-64.zip Chatterino2/
shell: cmd
- name: Build with CMake (Windows) - name: Build with CMake (Windows)
if: startsWith(matrix.os, 'windows') && matrix.build-system == 'cmake' if: startsWith(matrix.os, 'windows') && matrix.build-system == 'cmake'
run: | run: |
call "%programfiles(x86)%\Microsoft Visual Studio\%vs_version%\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
mkdir build mkdir build
cd build cd build
"C:\Program Files\Conan\conan\conan.exe" install .. conan install ..
cmake -G"NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DUSE_CONAN=ON .. cmake -G"NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DUSE_CONAN=ON ..
set cl=/MP set cl=/MP
nmake /S /NOLOGO nmake /S /NOLOGO
@@ -109,13 +110,6 @@ jobs:
cp bin/chatterino.exe Chatterino2/ cp bin/chatterino.exe Chatterino2/
echo nightly > Chatterino2/modes echo nightly > Chatterino2/modes
7z a chatterino-windows-x86-64.zip Chatterino2/ 7z a chatterino-windows-x86-64.zip Chatterino2/
shell: cmd
- name: Ensure build succeeded (Windows)
if: startsWith(matrix.os, 'windows')
run: |
cd build
ls Chatterino2/chatterino.exe
- name: Upload artifact (Windows) - name: Upload artifact (Windows)
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')