Skip to content

Commit d4115b4

Browse files
committed
test Win MSVC build action
Signed-off-by: Martin <[email protected]>
1 parent c2a6ef1 commit d4115b4

File tree

3 files changed

+61
-60
lines changed

3 files changed

+61
-60
lines changed

.github/workflows/build.yml

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -337,69 +337,69 @@ jobs:
337337
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
338338

339339

340-
# # --------------------------
341-
# # --- Windows MSVC steps ---
342-
# # --------------------------
343-
# #
344-
# windows-msvc_x64:
345-
# runs-on: windows-2022
346-
# steps:
340+
# --------------------------
341+
# --- Windows MSVC steps ---
342+
# --------------------------
343+
#
344+
windows-msvc_x64:
345+
runs-on: windows-2022
346+
steps:
347347

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
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
355355

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
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
367367
368-
# - name: Install Qt for Windows
369-
# uses: jurplel/install-qt-action@v3
368+
- name: Install Qt for Windows
369+
uses: jurplel/install-qt-action@v4
370370

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
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
376376

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
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
396390
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 }}
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 (c2a6ef1): Fix GitHub runner Linux build – Temporarily disable Windows build
12
2025-08-30 (a591a6e): update GitHub runner CI/CD script, update docs
23
2025-08-30 (05ec4ee): Qt5 -> Qt6 transition
34
2025-03-25 (982f746): Update italian translations

openhantek/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_range_for)
7171
if(MSVC)
7272
include(../cmake/fftw_on_windows.cmake)
7373
include(../cmake/libusb_on_windows.cmake)
74-
include(../cmake/copy_qt5_dlls_to_bin_dir.cmake)
74+
include(../cmake/copy_qt6_dlls_to_bin_dir.cmake)
7575
target_compile_options(${PROJECT_NAME} PRIVATE "/W4" "/wd4251" "/wd4127" "/wd4275" "/wd4200" "/nologo" "/J" "/Zi")
7676
target_compile_options(${PROJECT_NAME} PRIVATE "$<$<CONFIG:DEBUG>:/MDd>")
7777
else()

0 commit comments

Comments
 (0)