From a9a8ccdc831a80d3e5cdce613e1cb9bf9ccce86e Mon Sep 17 00:00:00 2001 From: KoenigMjr <135820716+KoenigMjr@users.noreply.github.com> Date: Wed, 4 Jun 2025 11:40:57 +0200 Subject: [PATCH 1/3] Update install.sh update to qmake6 --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 0e02751..3667f2e 100644 --- a/install.sh +++ b/install.sh @@ -113,7 +113,7 @@ tput cup 13 15 echo "[ 2/9] [##-------]" tput cup 15 5 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 tput cup 13 15 @@ -166,7 +166,7 @@ tput cup 15 5 echo "-> compile multimon-ng................." mkdir -p 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 make >> ${boswatch_install_path}/setup_log.txt 2>&1 From ffb1256e24a6c31a3756900796a19709256c9219 Mon Sep 17 00:00:00 2001 From: KoenigMjr <135820716+KoenigMjr@users.noreply.github.com> Date: Mon, 9 Jun 2025 12:54:38 +0200 Subject: [PATCH 2/3] Update run_pytest.yml --- .github/workflows/run_pytest.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/run_pytest.yml b/.github/workflows/run_pytest.yml index a047d48..0f26b5e 100644 --- a/.github/workflows/run_pytest.yml +++ b/.github/workflows/run_pytest.yml @@ -8,14 +8,14 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: ['3.7', '3.8', '3.9', '3.10'] - runs-on: ${{matrix.os}} + python-version: ['3.8', '3.9', '3.10'] + runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - - name: Set up Python ${{matrix.python-version}} at ${{matrix.os}} - uses: actions/setup-python@v3 + - name: Set up Python ${{ matrix.python-version }} at ${{ matrix.os }} + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} @@ -23,14 +23,14 @@ jobs: run: | python -m pip install --upgrade pip pip install -r requirements.txt - mkdir log/ + mkdir -p log/ - name: Test with pytest run: | - pytest -c 'test/pytest.ini' + pytest -c test/pytest.ini - name: Save artifacts - uses: actions/upload-artifact@master + uses: actions/upload-artifact@v4 with: name: test.log - path: log/test.log + path: log/test.log \ No newline at end of file From 203feccbc688e6843b32e32b51c7bf87cc50c113 Mon Sep 17 00:00:00 2001 From: KoenigMjr <135820716+KoenigMjr@users.noreply.github.com> Date: Mon, 9 Jun 2025 18:18:03 +0200 Subject: [PATCH 3/3] Revert "Update run_pytest.yml" This reverts commit ffb1256e24a6c31a3756900796a19709256c9219. --- .github/workflows/run_pytest.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/run_pytest.yml b/.github/workflows/run_pytest.yml index 0f26b5e..a047d48 100644 --- a/.github/workflows/run_pytest.yml +++ b/.github/workflows/run_pytest.yml @@ -8,14 +8,14 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: ['3.8', '3.9', '3.10'] - runs-on: ${{ matrix.os }} + python-version: ['3.7', '3.8', '3.9', '3.10'] + runs-on: ${{matrix.os}} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v1 - - name: Set up Python ${{ matrix.python-version }} at ${{ matrix.os }} - uses: actions/setup-python@v4 + - name: Set up Python ${{matrix.python-version}} at ${{matrix.os}} + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} @@ -23,14 +23,14 @@ jobs: run: | python -m pip install --upgrade pip pip install -r requirements.txt - mkdir -p log/ + mkdir log/ - name: Test with pytest run: | - pytest -c test/pytest.ini + pytest -c 'test/pytest.ini' - name: Save artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@master with: name: test.log - path: log/test.log \ No newline at end of file + path: log/test.log