Update CI

This commit is contained in:
yossizap 2020-12-15 19:44:32 +00:00 committed by Florian Märkl
parent 14f8a13cc5
commit f966551387
2 changed files with 10 additions and 1 deletions

View File

@ -49,12 +49,14 @@ build_script:
-DCUTTER_PACKAGE_JSDEC=ON -DCUTTER_PACKAGE_JSDEC=ON
-DCUTTER_ENABLE_DEPENDENCY_DOWNLOADS=ON -DCUTTER_ENABLE_DEPENDENCY_DOWNLOADS=ON
-DCUTTER_ENABLE_CRASH_REPORTS=ON -DCUTTER_ENABLE_CRASH_REPORTS=ON
-DCUTTER_ENABLE_TESTS=ON
-DCMAKE_PREFIX_PATH=%CUTTER_DEPS%\\pyside -DCMAKE_PREFIX_PATH=%CUTTER_DEPS%\\pyside
-DCPACK_PACKAGE_FILE_NAME=%PACKAGE_NAME% -DCPACK_PACKAGE_FILE_NAME=%PACKAGE_NAME%
-G Ninja -G Ninja
.." .."
- cmd: cmake --build . --config Release - cmd: cmake --build . --config Release
- cmd: cmake --build . --config Release --target package - cmd: cmake --build . --config Release --target package
- cmd: src/test/CutterTest
# Tests # Tests
test: off test: off

View File

@ -117,6 +117,7 @@ jobs:
-DCUTTER_ENABLE_PYTHON_BINDINGS=ON \ -DCUTTER_ENABLE_PYTHON_BINDINGS=ON \
-DCUTTER_ENABLE_GRAPHVIZ=OFF \ -DCUTTER_ENABLE_GRAPHVIZ=OFF \
-DCUTTER_ENABLE_CRASH_REPORTS=ON \ -DCUTTER_ENABLE_CRASH_REPORTS=ON \
-DCUTTER_ENABLE_TESTS=ON \
-DCUTTER_USE_BUNDLED_RIZIN=ON \ -DCUTTER_USE_BUNDLED_RIZIN=ON \
-DCUTTER_APPIMAGE_BUILD=ON \ -DCUTTER_APPIMAGE_BUILD=ON \
-DCUTTER_ENABLE_PACKAGING=ON \ -DCUTTER_ENABLE_PACKAGING=ON \
@ -131,9 +132,11 @@ jobs:
-G Ninja \ -G Ninja \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCUTTER_USE_BUNDLED_RIZIN=ON \ -DCUTTER_USE_BUNDLED_RIZIN=ON \
-DCUTTER_ENABLE_TESTS=ON \
.. ..
fi fi
ninja ninja
./src/test/CutterTest
if [[ "${{ matrix.package || false }}" = "true" ]] if [[ "${{ matrix.package || false }}" = "true" ]]
then then
export CUTTER_VERSION=$(python ../scripts/get_version.py) export CUTTER_VERSION=$(python ../scripts/get_version.py)
@ -185,6 +188,7 @@ jobs:
-DCUTTER_ENABLE_CRASH_REPORTS=ON \ -DCUTTER_ENABLE_CRASH_REPORTS=ON \
-DCUTTER_USE_BUNDLED_RIZIN=ON \ -DCUTTER_USE_BUNDLED_RIZIN=ON \
-DCUTTER_ENABLE_PACKAGING=ON \ -DCUTTER_ENABLE_PACKAGING=ON \
-DCUTTER_ENABLE_TESTS=ON \
-DCUTTER_PACKAGE_DEPENDENCIES=ON \ -DCUTTER_PACKAGE_DEPENDENCIES=ON \
-DCUTTER_ENABLE_DEPENDENCY_DOWNLOADS=ON \ -DCUTTER_ENABLE_DEPENDENCY_DOWNLOADS=ON \
-DCUTTER_PACKAGE_RZ_GHIDRA=ON \ -DCUTTER_PACKAGE_RZ_GHIDRA=ON \
@ -198,7 +202,8 @@ jobs:
make package make package
export CUTTER_VERSION=$(python3 ../scripts/get_version.py) export CUTTER_VERSION=$(python3 ../scripts/get_version.py)
echo PACKAGE_NAME=${PACKAGE_NAME}.dmg >> $GITHUB_ENV echo PACKAGE_NAME=${PACKAGE_NAME}.dmg >> $GITHUB_ENV
echo UPLOAD_ASSET_TYPE=application/x-apple-diskimage >> $GITHUB_ENV echo UPLOAD_ASSET_TYPE=application/x-apple-diskimage >> $GITHUB_ENVV
./src/test/CutterTest;
- name: windows dependencies - name: windows dependencies
if: contains(matrix.os, 'windows') if: contains(matrix.os, 'windows')
shell: bash shell: bash
@ -222,6 +227,7 @@ jobs:
cmake ^ cmake ^
-DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_BUILD_TYPE=Release ^
-DCUTTER_USE_BUNDLED_RIZIN=ON ^ -DCUTTER_USE_BUNDLED_RIZIN=ON ^
-DCUTTER_ENABLE_TESTS=ON \
-DCUTTER_ENABLE_PYTHON=ON ^ -DCUTTER_ENABLE_PYTHON=ON ^
-DCUTTER_ENABLE_PYTHON_BINDINGS=ON ^ -DCUTTER_ENABLE_PYTHON_BINDINGS=ON ^
-DCUTTER_ENABLE_PACKAGING=ON ^ -DCUTTER_ENABLE_PACKAGING=ON ^
@ -237,6 +243,7 @@ jobs:
.. ..
cmake --build . --config Release cmake --build . --config Release
cmake --build . --config Release --target package cmake --build . --config Release --target package
./src/test/CutterTest
echo PACKAGE_NAME=%PACKAGE_NAME%.zip >> %GITHUB_ENV% echo PACKAGE_NAME=%PACKAGE_NAME%.zip >> %GITHUB_ENV%
echo UPLOAD_ASSET_TYPE=application/zip >> %GITHUB_ENV% echo UPLOAD_ASSET_TYPE=application/zip >> %GITHUB_ENV%
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2