Skip to content

Commit c2a6ef1

Browse files
committed
Fix GitHub runner Linux build – Temporarily disable Windows build
Signed-off-by: Martin <[email protected]>
1 parent a591a6e commit c2a6ef1

File tree

2 files changed

+142
-141
lines changed

2 files changed

+142
-141
lines changed

.github/workflows/build.yml

Lines changed: 141 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ jobs:
6464
mkdir build
6565
sudo apt update
6666
# sudo apt -y upgrade
67-
sudo apt install g++ make cmake fakeroot rpm qttools6-dev libfftw3-dev binutils-dev \
68-
libusb-1.0-0-dev libqt6opengl6-dev mesa-common-dev libgl1-mesa-dev libgles2-mesa-dev
67+
sudo apt install g++ make cmake fakeroot rpm qt6-tools-dev libfftw3-dev binutils-dev \
68+
libusb-1.0-0-dev libqt6opengl6 mesa-common-dev libgl1-mesa-dev libgles2-mesa-dev qt6-base-dev
6969
7070
- name: Ubuntu Build
7171
# GitHub hosts Linux runners on Standard_DS2_v2 virtual machines in Microsoft Azure:
@@ -263,143 +263,143 @@ jobs:
263263
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
264264

265265

266-
# ---------------------------
267-
# --- Windows MINGW steps ---
268-
# ---------------------------
269-
#
270-
windows-mingw_w64:
271-
runs-on: windows-2022
272-
steps:
273-
274-
# --- Clone the latest commit ---
275-
- name: Checkout
276-
uses: actions/checkout@v3
277-
with:
278-
fetch-tags: true
279-
submodules: recursive
280-
fetch-depth: 0
281-
282-
# --- Config git and get the version from "git describe" ---
283-
- name: Config Git
284-
id: config_git
285-
shell: bash
286-
run: |
287-
git config user.email "[email protected]"
288-
git config user.name "Ho-Ro"
289-
git fetch --tags --force || true
290-
git submodule update --init --recursive
291-
echo "git_describe=$(git describe)"
292-
echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
293-
294-
- name: Install MSYS2 Packages
295-
uses: msys2/setup-msys2@v2
296-
with:
297-
update: true
298-
install: >-
299-
mingw-w64-x86_64-cmake
300-
mingw-w64-x86_64-gcc
301-
mingw-w64-x86_64-qt6-static
302-
mingw-w64-x86_64-fftw
303-
mingw-w64-x86_64-libusb
304-
305-
- name: Start Windows Build
306-
shell: msys2 {0}
307-
run: |
308-
cmake -D CMAKE_PREFIX_PATH=/mingw64/qt6-static -D CMAKE_BUILD_TYPE=$BUILD_TYPE -B build
309-
cmake --build build --parallel 8 --target package
310-
311-
- name: Create Windows Package
312-
# GitHub hosts Windows runners on Standard_DS2_v2 virtual machines in Microsoft Azure:
313-
# 2-core CPU, 7 GB of RAM memory, 14 GB of SSD disk space
314-
working-directory: ${{github.workspace}}/build
315-
shell: bash
316-
run: |
317-
# this ZIP package contains only OpenHantek.exe, just get the name
318-
ZIP=$(basename packages/openhantek_*_mingw_x64.zip)
319-
rm -f packages/openhantek_*_mingw_x64.*
320-
cd openhantek
321-
7z a ../packages/$ZIP *.exe driver documents
322-
ls -l ../packages
323-
324-
- name: Upload Windows Artifacts
325-
uses: actions/upload-artifact@v4
326-
with:
327-
name: openhantek_${{ steps.config_git.outputs.git_describe }}_mingw_x64
328-
path: ./build/packages/*.zip
329-
330-
- name: Upload Windows Release Assets
331-
if: startsWith(github.ref, 'refs/tags/')
332-
uses: softprops/action-gh-release@v1
333-
with:
334-
prerelease: true
335-
files: ./build/packages/*
336-
env:
337-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
338-
339-
340-
# --------------------------
341-
# --- Windows MSVC steps ---
342-
# --------------------------
343-
#
344-
windows-msvc_x64:
345-
runs-on: windows-2022
346-
steps:
347-
348-
# --- Clone the latest commit ---
349-
- name: Checkout
350-
uses: actions/checkout@v3
351-
with:
352-
fetch-tags: true
353-
submodules: recursive
354-
fetch-depth: 0
355-
356-
# --- Config git and get the version from "git describe" ---
357-
- name: Config Git
358-
id: config_git
359-
shell: bash
360-
run: |
361-
git config user.email "[email protected]"
362-
git config user.name "Ho-Ro"
363-
git fetch --tags --force || true
364-
git submodule update --init --recursive
365-
echo "git_describe=$(git describe)"
366-
echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
367-
368-
- name: Install Qt for Windows
369-
uses: jurplel/install-qt-action@v3
370-
371-
- name: Setup Windows MSVC Build
372-
run:
373-
md build &
374-
call "%VCINSTALLDIR%/Auxiliary/Build/vcvars64.bat" &
375-
cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_PREFIX_PATH=%Qt6_DIR% -DCMAKE_BUILD_TYPE=Release -Bbuild
376-
377-
- name: Windows MSVC Build
378-
# GitHub hosts Windows runners on Standard_DS2_v2 virtual machines in Microsoft Azure:
379-
# 2-core CPU, 7 GB of RAM memory, 14 GB of SSD disk space
380-
working-directory: ${{github.workspace}}/build
381-
shell: bash
382-
run: |
383-
cmake --build . --parallel 8 --config Release --target package
384-
ZIP=$(basename packages/openhantek_*_msvc_x64.zip)
385-
rm -f packages/openhantek_*_msvc_x64.*
386-
cd openhantek/Release
387-
7z a ../../packages/$ZIP *
388-
cd ../..
389-
ls -l packages
390-
391-
- name: Upload Windows MSVC Artifacts
392-
uses: actions/upload-artifact@v4
393-
with:
394-
name: openhantek_${{ steps.config_git.outputs.git_describe }}_msvc_x64
395-
path: ./build/packages/*.zip
396-
397-
- name: Upload Windows MSVC Release Assets
398-
if: startsWith(github.ref, 'refs/tags/')
399-
uses: softprops/action-gh-release@v1
400-
with:
401-
prerelease: true
402-
files: ./build/packages/*
403-
env:
404-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
266+
# # ---------------------------
267+
# # --- Windows MINGW steps ---
268+
# # ---------------------------
269+
# #
270+
# windows-mingw_w64:
271+
# runs-on: windows-2022
272+
# steps:
273+
274+
# # --- Clone the latest commit ---
275+
# - name: Checkout
276+
# uses: actions/checkout@v3
277+
# with:
278+
# fetch-tags: true
279+
# submodules: recursive
280+
# fetch-depth: 0
281+
282+
# # --- Config git and get the version from "git describe" ---
283+
# - name: Config Git
284+
# id: config_git
285+
# shell: bash
286+
# run: |
287+
# git config user.email "[email protected]"
288+
# git config user.name "Ho-Ro"
289+
# git fetch --tags --force || true
290+
# git submodule update --init --recursive
291+
# echo "git_describe=$(git describe)"
292+
# echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
293+
294+
# - name: Install MSYS2 Packages
295+
# uses: msys2/setup-msys2@v2
296+
# with:
297+
# update: true
298+
# install: >-
299+
# mingw-w64-x86_64-cmake
300+
# mingw-w64-x86_64-gcc
301+
# mingw-w64-x86_64-qt6-static
302+
# mingw-w64-x86_64-fftw
303+
# mingw-w64-x86_64-libusb
304+
305+
# - name: Start Windows Build
306+
# shell: msys2 {0}
307+
# run: |
308+
# cmake -D CMAKE_PREFIX_PATH=/mingw64/qt6-static -D CMAKE_BUILD_TYPE=$BUILD_TYPE -B build
309+
# cmake --build build --parallel 8 --target package
310+
311+
# - name: Create Windows Package
312+
# # GitHub hosts Windows runners on Standard_DS2_v2 virtual machines in Microsoft Azure:
313+
# # 2-core CPU, 7 GB of RAM memory, 14 GB of SSD disk space
314+
# working-directory: ${{github.workspace}}/build
315+
# shell: bash
316+
# run: |
317+
# # this ZIP package contains only OpenHantek.exe, just get the name
318+
# ZIP=$(basename packages/openhantek_*_mingw_x64.zip)
319+
# rm -f packages/openhantek_*_mingw_x64.*
320+
# cd openhantek
321+
# 7z a ../packages/$ZIP *.exe driver documents
322+
# ls -l ../packages
323+
324+
# - name: Upload Windows Artifacts
325+
# uses: actions/upload-artifact@v4
326+
# with:
327+
# name: openhantek_${{ steps.config_git.outputs.git_describe }}_mingw_x64
328+
# path: ./build/packages/*.zip
329+
330+
# - name: Upload Windows Release Assets
331+
# if: startsWith(github.ref, 'refs/tags/')
332+
# uses: softprops/action-gh-release@v1
333+
# with:
334+
# prerelease: true
335+
# files: ./build/packages/*
336+
# env:
337+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
338+
339+
340+
# # --------------------------
341+
# # --- Windows MSVC steps ---
342+
# # --------------------------
343+
# #
344+
# windows-msvc_x64:
345+
# runs-on: windows-2022
346+
# steps:
347+
348+
# # --- Clone the latest commit ---
349+
# - name: Checkout
350+
# uses: actions/checkout@v3
351+
# with:
352+
# fetch-tags: true
353+
# submodules: recursive
354+
# fetch-depth: 0
355+
356+
# # --- Config git and get the version from "git describe" ---
357+
# - name: Config Git
358+
# id: config_git
359+
# shell: bash
360+
# run: |
361+
# git config user.email "[email protected]"
362+
# git config user.name "Ho-Ro"
363+
# git fetch --tags --force || true
364+
# git submodule update --init --recursive
365+
# echo "git_describe=$(git describe)"
366+
# echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
367+
368+
# - name: Install Qt for Windows
369+
# uses: jurplel/install-qt-action@v3
370+
371+
# - name: Setup Windows MSVC Build
372+
# run:
373+
# md build &
374+
# call "%VCINSTALLDIR%/Auxiliary/Build/vcvars64.bat" &
375+
# cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_PREFIX_PATH=%Qt6_DIR% -DCMAKE_BUILD_TYPE=Release -Bbuild
376+
377+
# - name: Windows MSVC Build
378+
# # GitHub hosts Windows runners on Standard_DS2_v2 virtual machines in Microsoft Azure:
379+
# # 2-core CPU, 7 GB of RAM memory, 14 GB of SSD disk space
380+
# working-directory: ${{github.workspace}}/build
381+
# shell: bash
382+
# run: |
383+
# cmake --build . --parallel 8 --config Release --target package
384+
# ZIP=$(basename packages/openhantek_*_msvc_x64.zip)
385+
# rm -f packages/openhantek_*_msvc_x64.*
386+
# cd openhantek/Release
387+
# 7z a ../../packages/$ZIP *
388+
# cd ../..
389+
# ls -l packages
390+
391+
# - name: Upload Windows MSVC Artifacts
392+
# uses: actions/upload-artifact@v4
393+
# with:
394+
# name: openhantek_${{ steps.config_git.outputs.git_describe }}_msvc_x64
395+
# path: ./build/packages/*.zip
396+
397+
# - name: Upload Windows MSVC Release Assets
398+
# if: startsWith(github.ref, 'refs/tags/')
399+
# uses: softprops/action-gh-release@v1
400+
# with:
401+
# prerelease: true
402+
# files: ./build/packages/*
403+
# env:
404+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
405405

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
2025-08-30 (a591a6e): update GitHub runner CI/CD script, update docs
12
2025-08-30 (05ec4ee): Qt5 -> Qt6 transition
23
2025-03-25 (982f746): Update italian translations
34
2025-03-19 (c58e155): rename desktop file according Wayland requirement (RevDom.AppName.desktop)

0 commit comments

Comments
 (0)