From 2cdefa00349f0a720ec03253047523a324c0d1b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Jos=C3=A9=20Carracedo=20Carballal?= Date: Sat, 1 Feb 2025 20:03:45 +0100 Subject: [PATCH] Try to make Win32 releases build --- .github/actions/win32deps/action.yml | 16 ++++++++ .github/workflows/ci.yml | 56 ++-------------------------- 2 files changed, 19 insertions(+), 53 deletions(-) create mode 100644 .github/actions/win32deps/action.yml diff --git a/.github/actions/win32deps/action.yml b/.github/actions/win32deps/action.yml new file mode 100644 index 0000000..65be9b7 --- /dev/null +++ b/.github/actions/win32deps/action.yml @@ -0,0 +1,16 @@ +name: Build +description: 'Install Win32 specific dependencies' + +inputs: + shell: + required: false + default: bash + +runs: + using: 'composite' + steps: + - name: Fix location of lrelease executable + shell: ${{inputs.shell}} + run: ln -s `which lrelease-qt6 /mingw64/bin/lrelease.exe` + + diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c4609fa..894f8e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,60 +81,10 @@ jobs: with: msystem: MINGW64 update: true - install: git mingw-w64-x86_64-cc mingw-w64-x86_64-make mingw-w64-x86_64-cmake mingw-w64-x86_64-libsndfile mingw-w64-x86_64-fftw mingw-w64-x86_64-volk mingw-w64-x86_64-libxml2 mingw-w64-x86_64-libusb mingw-w64-x86_64-qt5 mingw-w64-x86_64-portaudio zip - - # SoapySDR - - name: Checkout (SoapySDR) - uses: actions/checkout@v2 - with: - repository: pothosware/SoapySDR - ref: refs/heads/master - path: SoapySDR - - - name: Configure (SoapySDR) - run: /mingw64/bin/cmake -G"MinGW Makefiles" -B SoapySDR/build -DCMAKE_INSTALL_PREFIX:PATH=/mingw64/ -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} SoapySDR/ - - - name: Build (SoapySDR) - run: /mingw64/bin/cmake --build SoapySDR/build --config ${{env.BUILD_TYPE}} - - - name: Install (SoapySDR) - run: /mingw64/bin/cmake --build SoapySDR/build --config ${{env.BUILD_TYPE}} --target install - - # BatchDrake's fixed rtl-sdr-blog - - name: Checkout (rtl-sdr-blog from BatchDrake) - uses: actions/checkout@v2 - with: - repository: BatchDrake/rtl-sdr-blog - ref: refs/heads/feature/xfer-completion - path: rtl-sdr-blog - - - name: Configure (rtl-sdr-blog) - run: /mingw64/bin/cmake -G"MinGW Makefiles" -B rtl-sdr-blog/build -DCMAKE_INSTALL_PREFIX:PATH=/mingw64 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} rtl-sdr-blog - - - name: Build (rtl-sdr-blog) - run: /mingw64/bin/cmake --build rtl-sdr-blog/build --config ${{env.BUILD_TYPE}} + install: git mingw-w64-x86_64-cc mingw-w64-x86_64-make mingw-w64-x86_64-cmake mingw-w64-x86_64-libsndfile mingw-w64-x86_64-fftw mingw-w64-x86_64-volk mingw-w64-x86_64-libxml2 mingw-w64-x86_64-libusb mingw-w64-x86_64-qt6 mingw-w64-x86_64-portaudio zip + - name: Install dependencies + uses: "./.github/actions/win32deps" - - name: Install (rtl-sdr-blog) - run: /mingw64/bin/cmake --build rtl-sdr-blog/build --config ${{env.BUILD_TYPE}} --target install - - # SoapyRTLSDR - - name: Checkout (SoapyRTLSDR) - uses: actions/checkout@v2 - with: - repository: pothosware/SoapyRTLSDR - ref: refs/heads/master - path: SoapyRTLSDR - - - name: Configure (SoapyRTLSDR) - run: /mingw64/bin/cmake -G"MinGW Makefiles" -B SoapyRTLSDR/build -DCMAKE_INSTALL_PREFIX:PATH=/mingw64/ -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} SoapyRTLSDR - - - name: Build (SoapyRTLSDR) - run: /mingw64/bin/cmake --build SoapyRTLSDR/build --config ${{env.BUILD_TYPE}} - - - name: Install (SoapyRTLSDR) - run: /mingw64/bin/cmake --build SoapyRTLSDR/build --config ${{env.BUILD_TYPE}} --target install - - # SigDigger - name: Build & Distribute (SigDigger) run: |