Merge branch 'develop' into feature/ISSUE-67

This commit is contained in:
Bastian Schroll 2025-06-11 09:59:46 +02:00 committed by GitHub
commit 399a768498
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 9 deletions

View file

@ -1,6 +1,8 @@
name: pytest name: pytest
on: [push, pull_request] on:
push:
pull_request:
jobs: jobs:
build: build:
@ -8,11 +10,11 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-latest] os: [ubuntu-latest]
python-version: ['3.7', '3.8', '3.9', '3.10'] python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v3
- name: Set up Python ${{matrix.python-version}} at ${{matrix.os}} - name: Set up Python ${{matrix.python-version}} at ${{matrix.os}}
uses: actions/setup-python@v3 uses: actions/setup-python@v3
@ -23,14 +25,14 @@ jobs:
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install -r requirements.txt pip install -r requirements.txt
mkdir log/ mkdir -p log/
- name: Test with pytest - name: Test with pytest
run: | run: |
pytest -c 'test/pytest.ini' pytest -c 'test/pytest.ini'
- name: Save artifacts - name: Save artifacts
uses: actions/upload-artifact@master uses: actions/upload-artifact@v4
with: with:
name: test.log name: test-${{ matrix.python-version }}.log
path: log/test.log path: log/test.log

View file

@ -113,7 +113,7 @@ tput cup 13 15
echo "[ 2/9] [##-------]" echo "[ 2/9] [##-------]"
tput cup 15 5 tput cup 15 5
echo "-> download GIT and other stuff.........." echo "-> download GIT and other stuff.........."
apt-get -y install git cmake build-essential libusb-1.0 qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools qt5-default libpulse-dev libx11-dev sox >> ${boswatch_install_path}/setup_log.txt 2>&1 apt-get -y install git cmake build-essential libusb-1.0 qmake6 qt6-base-dev libpulse-dev libx11-dev sox >> ${boswatch_install_path}/setup_log.txt 2>&1
exitcodefunction $? download stuff exitcodefunction $? download stuff
tput cup 13 15 tput cup 13 15
@ -166,7 +166,7 @@ tput cup 15 5
echo "-> compile multimon-ng................." echo "-> compile multimon-ng................."
mkdir -p build mkdir -p build
cd build cd build
qmake -qt=qt5 ../multimon-ng.pro >> ${boswatch_install_path}/setup_log.txt 2>&1 qmake6 ../multimon-ng.pro >> ${boswatch_install_path}/setup_log.txt 2>&1
exitcodefunction $? qmake multimonNG exitcodefunction $? qmake multimonNG
make >> ${boswatch_install_path}/setup_log.txt 2>&1 make >> ${boswatch_install_path}/setup_log.txt 2>&1

View file

@ -8,7 +8,7 @@ mkdocs
# for develope only # for develope only
pytest pytest
pytest-cov pytest-cov
flake8==4.0.1 flake8==6.1.0
pytest-flake8 pytest-flake8
pytest-flakes pytest-flakes
pytest-randomly pytest-randomly