walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

CI-windows.yml: added windows-2022, removed QT 5.9.9 and use msbuild instead of CMake for now (#3730)

This commit is contained in:
Oliver Stöneberg 2022-02-04 19:37:53 +01:00 committed by GitHub
parent 7f28edbe26
commit c2b5cdcca5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
.github/workflows/CI-windows.yml vendored
View File

@ -15,9 +15,9 @@ jobs:
build: build:
strategy: strategy:
matrix: matrix:
os: [windows-2019] os: [windows-2019, windows-2022]
arch: [x64, x86] arch: [x64, x86]
qt_ver: ['', 5.9.9, 5.15.2] qt_ver: ['', 5.15.2]
fail-fast: false fail-fast: false
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
@ -38,9 +38,10 @@ jobs:
with: with:
python-version: '3.10' python-version: '3.10'
- name: Setup msbuild.exe - name: Set up Visual Studio environment
if: matrix.qt_ver == '' uses: ilammy/msvc-dev-cmd@v1
uses: microsoft/setup-msbuild@v1.0.2 with:
arch: ${{ matrix.arch }}
- name: Cache PCRE - name: Cache PCRE
id: cache-pcre id: cache-pcre
@ -58,7 +59,6 @@ jobs:
- name: Install PCRE - name: Install PCRE
if: matrix.arch == 'x64' || matrix.qt_ver == '' if: matrix.arch == 'x64' || matrix.qt_ver == ''
run: | run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.arch }} || exit /b !errorlevel!
7z x pcre-%PCRE_VERSION%.zip || exit /b !errorlevel! 7z x pcre-%PCRE_VERSION%.zip || exit /b !errorlevel!
cd pcre-%PCRE_VERSION% || exit /b !errorlevel! cd pcre-%PCRE_VERSION% || exit /b !errorlevel!
cmake . -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DPCRE_BUILD_PCRECPP=Off -DPCRE_BUILD_TESTS=Off -DPCRE_BUILD_PCREGREP=Off || exit /b !errorlevel! cmake . -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DPCRE_BUILD_PCRECPP=Off -DPCRE_BUILD_TESTS=Off -DPCRE_BUILD_PCREGREP=Off || exit /b !errorlevel!
@ -118,7 +118,6 @@ jobs:
- name: Build GUI release - name: Build GUI release
if: matrix.qt_ver != '' && matrix.arch == 'x64' if: matrix.qt_ver != '' && matrix.arch == 'x64'
run: | run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.arch }} || exit /b !errorlevel!
cd gui || exit /b !errorlevel! cd gui || exit /b !errorlevel!
qmake HAVE_QCHART=yes || exit /b !errorlevel! qmake HAVE_QCHART=yes || exit /b !errorlevel!
nmake release || exit /b !errorlevel! nmake release || exit /b !errorlevel!
@ -132,10 +131,9 @@ jobs:
del Build\gui\cppcheck-gui.ilk || exit /b !errorlevel! del Build\gui\cppcheck-gui.ilk || exit /b !errorlevel!
del Build\gui\cppcheck-gui.pdb || exit /b !errorlevel! del Build\gui\cppcheck-gui.pdb || exit /b !errorlevel!
- name: Configure MSBuild - name: Run CMake
if: matrix.qt_ver == '' if: false && matrix.qt_ver == ''
run: | run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.arch }} || exit /b !errorlevel!
set ARCH=${{ matrix.arch }} set ARCH=${{ matrix.arch }}
if "${{ matrix.arch }}" == "x86" ( if "${{ matrix.arch }}" == "x86" (
set ARCH=Win32 set ARCH=Win32
@ -148,28 +146,38 @@ jobs:
- name: Build CLI debug configuration using MSBuild - name: Build CLI debug configuration using MSBuild
if: matrix.qt_ver == '' if: matrix.qt_ver == ''
run: | run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.arch }} || exit /b !errorlevel!
set ARCH=${{ matrix.arch }} set ARCH=${{ matrix.arch }}
if "${{ matrix.arch }}" == "x86" ( if "${{ matrix.arch }}" == "x86" (
set ARCH=Win32 set ARCH=Win32
) )
cmake --build build --target check --config Debug || exit /b !errorlevel! :: cmake --build build --target check --config Debug || exit /b !errorlevel!
msbuild -m cppcheck.sln /p:Configuration=Debug-PCRE;Platform=%ARCH% -maxcpucount || exit /b !errorlevel!
- name: Run Debug test
if: matrix.qt_ver == ''
run: .\bin\debug\testrunner.exe || exit /b !errorlevel!
- name: Build CLI release configuration using MSBuild - name: Build CLI release configuration using MSBuild
if: matrix.qt_ver == '' if: matrix.qt_ver == ''
run: | run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.arch }} || exit /b !errorlevel!
set ARCH=${{ matrix.arch }} set ARCH=${{ matrix.arch }}
if "${{ matrix.arch }}" == "x86" ( if "${{ matrix.arch }}" == "x86" (
set ARCH=Win32 set ARCH=Win32
) )
cmake --build build --target check --config Release || exit /b !errorlevel! :: cmake --build build --target check --config Release || exit /b !errorlevel!
msbuild -m cppcheck.sln /p:Configuration=Release-PCRE;Platform=%ARCH% -maxcpucount || exit /b !errorlevel!
- name: Run Release test
if: matrix.qt_ver == ''
run: .\bin\testrunner.exe || exit /b !errorlevel!
- name: Run test/cli - name: Run test/cli
if: matrix.qt_ver == '' if: matrix.qt_ver == ''
run: | run: |
:: since FILESDIR is not set copy the binary to the root so the addons are found :: since FILESDIR is not set copy the binary to the root so the addons are found
copy .\build\bin\Release\cppcheck.exe .\cppcheck.exe || exit /b !errorlevel! :: copy .\build\bin\Release\cppcheck.exe .\cppcheck.exe || exit /b !errorlevel!
copy .\bin\cppcheck.exe .\cppcheck.exe || exit /b !errorlevel!
copy .\bin\cppcheck-core.dll .\cppcheck-core.dll || exit /b !errorlevel!
cd test/cli || exit /b !errorlevel! cd test/cli || exit /b !errorlevel!
:: python -m pytest --suppress-no-test-exit-code test-clang-import.py || exit /b !errorlevel! :: python -m pytest --suppress-no-test-exit-code test-clang-import.py || exit /b !errorlevel!
python -m pytest test-helloworld.py || exit /b !errorlevel! python -m pytest test-helloworld.py || exit /b !errorlevel!