diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 82ee222a2..968d371c5 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -23,11 +23,13 @@ jobs: run: | wget https://www.sdrplay.com/software/SDRplayAPI-macos-installer-universal-3.15.0.pkg sudo installer -pkg SDRplayAPI-macos-installer-universal-3.15.0.pkg -target / + - name: Install python + run: | + wget https://www.python.org/ftp/python/3.12.7/python-3.12.7-macos11.pkg + sudo installer -pkg python-3.12.7-macos11.pkg -target / - name: Install python packages for UHD run: | - python3 -m venv .venv - source .venv/bin/activate - python3 -m pip install numpy mako requests Cheetah3 setuptools + /usr/local/bin/python3.12 -m pip install numpy mako requests Cheetah3 setuptools - name: Install Qt uses: jurplel/install-qt-action@v4 with: @@ -37,12 +39,10 @@ jobs: modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine qtshadertools qtwebchannel' - name: Configure SDRangel run: | - source .venv/bin/activate mkdir build && cd build - cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON -DENABLE_USRP=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=ON -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE -DPYTHON_EXECUTABLE=`pwd`/.venv/bin/python3 + cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON -DENABLE_USRP=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=ON -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE -DPYTHON_EXECUTABLE=/usr/local/bin/python3.12 - name: Build SDRangel on Mac run: | - source .venv/bin/activate cd build make -j4 package - name: Get version @@ -82,12 +82,13 @@ jobs: run: | wget https://www.sdrplay.com/software/SDRplayAPI-macos-installer-universal-3.15.0.pkg sudo installer -pkg SDRplayAPI-macos-installer-universal-3.15.0.pkg -target / + - name: Install python + run: | + wget https://www.python.org/ftp/python/3.12.7/python-3.12.7-macos11.pkg + sudo installer -pkg python-3.12.7-macos11.pkg -target / - name: Install python packages for UHD run: | - python3 -m venv .venv - source .venv/bin/activate - which python3 - python3 -m pip install numpy mako requests Cheetah3 setuptools + /usr/local/bin/python3.12 -m pip install numpy mako requests Cheetah3 setuptools - name: Install Qt uses: jurplel/install-qt-action@v4 with: @@ -97,13 +98,10 @@ jobs: modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine qtshadertools qtwebchannel' - name: Configure SDRangel run: | - source .venv/bin/activate - which python3 mkdir build && cd build - cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DDEBUG_OUTPUT=ON -DENABLE_USRP=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=ON -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE -DPYTHON_EXECUTABLE=`pwd`/.venv/bin/python3 + cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DDEBUG_OUTPUT=ON -DENABLE_USRP=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=ON -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE -DPYTHON_EXECUTABLE=/usr/local/bin/python3.12 - name: Build SDRangel on Mac run: | - source .venv/bin/activate cd build make -j3 package - name: Get version