From a5d1f48580a51ce04e74d38c5e3bf466419800a4 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Wed, 23 Apr 2025 08:25:47 +0100 Subject: [PATCH 1/4] Try setup-python: true to fix #2441 --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 14136e65e..be0c0d991 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -70,7 +70,7 @@ jobs: version: '6.7.3' dir: ${{matrix.config.QT_INST_DIR}} arch: ${{matrix.config.QT_ARCH}} - setup-python: false + setup-python: true modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine qtshadertools qtwebchannel' - name: build sdrangel on Windows if: startsWith(matrix.config.os, 'windows') From 1074bd01055eb25ab206d1f95bed59318c3464f7 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Wed, 23 Apr 2025 08:40:40 +0100 Subject: [PATCH 2/4] Try earlier versions to work around #2441 --- .github/workflows/windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index be0c0d991..8197c1aaf 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -71,6 +71,8 @@ jobs: dir: ${{matrix.config.QT_INST_DIR}} arch: ${{matrix.config.QT_ARCH}} setup-python: true + aqtversion: '==3.1.*' + py7zrversion: '==0.20.*' modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine qtshadertools qtwebchannel' - name: build sdrangel on Windows if: startsWith(matrix.config.os, 'windows') From c108f5be4001ace5cc1240e83fb6c0483e98a500 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Wed, 23 Apr 2025 09:10:24 +0100 Subject: [PATCH 3/4] Try using Python 3.12 instead --- .github/workflows/windows.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8197c1aaf..166f893ed 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -37,6 +37,9 @@ jobs: echo github.event_name: ${{ github.event_name }} echo github.ref: ${{ github.ref }} echo github.workspace: ${{ github.workspace }} + - uses: actions/setup-python@v5 + with: + python-version: '3.12' - name: Install basic dependencies on Windows if: startsWith(matrix.config.os, 'windows') run: | @@ -70,9 +73,7 @@ jobs: version: '6.7.3' dir: ${{matrix.config.QT_INST_DIR}} arch: ${{matrix.config.QT_ARCH}} - setup-python: true - aqtversion: '==3.1.*' - py7zrversion: '==0.20.*' + setup-python: 'false' modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine qtshadertools qtwebchannel' - name: build sdrangel on Windows if: startsWith(matrix.config.os, 'windows') From 0111ce247be956a43c5971f9ea4001e9d57603d6 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Wed, 23 Apr 2025 09:20:55 +0100 Subject: [PATCH 4/4] Try Python 3.12 for CI build as well. --- .github/workflows/sdrangel.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml index 84d54112c..8a2c0e321 100644 --- a/.github/workflows/sdrangel.yml +++ b/.github/workflows/sdrangel.yml @@ -41,6 +41,9 @@ jobs: echo github.event_name: ${{ github.event_name }} echo github.ref: ${{ github.ref }} echo github.workspace: ${{ github.workspace }} + - uses: actions/setup-python@v5 + with: + python-version: '3.12' - name: Install basic dependencies on Windows if: startsWith(matrix.config.os, 'windows') run: |