Skip to content

Commit fa50d18

Browse files
authored
refs #13132 - release-windows.yml: fixed .qm handling for CMake [skip ci] (#6976)
1 parent db8e755 commit fa50d18

File tree

2 files changed

+5
-14
lines changed

2 files changed

+5
-14
lines changed

.github/workflows/release-windows.yml

+5-11
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,10 @@ jobs:
6969
tools: 'tools_opensslv3_x64'
7070
cache: true
7171

72-
- name: Create .qm
73-
run: |
74-
cd gui || exit /b !errorlevel!
75-
lupdate gui.pro -no-obsolete || exit /b !errorlevel!
76-
lrelease gui.pro -removeidentical || exit /b !errorlevel!
77-
7872
- name: Build x64 release GUI
7973
run: |
80-
; TODO: enable rules?
81-
; specify Release build so matchcompiler is used
74+
:: TODO: enable rules?
75+
:: specify Release build so matchcompiler is used
8276
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_ONLINE_HELP=On || exit /b !errorlevel!
8377
cmake --build build --target cppcheck-gui --config Release || exit /b !errorlevel!
8478
@@ -112,16 +106,16 @@ jobs:
112106
mkdir win_installer\files\help || exit /b !errorlevel!
113107
xcopy /s gui\help win_installer\files\help || exit /b !errorlevel!
114108
del win_installer\files\translations\*.qm || exit /b !errorlevel!
115-
move gui\*.qm win_installer\files\translations || exit /b !errorlevel!
109+
move build\gui\*.qm win_installer\files\translations || exit /b !errorlevel!
116110
:: copy libcrypto-3-x64.dll and libssl-3-x64.dll
117111
copy %RUNNER_WORKSPACE%\Qt\Tools\OpenSSLv3\Win_x64\bin\lib*.dll win_installer\files || exit /b !errorlevel!
118112
119113
- name: Build Installer
120114
run: |
121115
cd win_installer || exit /b !errorlevel!
122-
REM Read ProductVersion
116+
:: Read ProductVersion
123117
for /f "tokens=4 delims= " %%a in ('find "ProductVersion" productInfo.wxi') do set PRODUCTVER=%%a
124-
REM Remove double quotes
118+
:: Remove double quotes
125119
set PRODUCTVER=%PRODUCTVER:"=%
126120
@echo ProductVersion="%PRODUCTVER%" || exit /b !errorlevel!
127121
msbuild -m cppcheck.wixproj -p:Platform=x64,ProductVersion=%PRODUCTVER%.${{ github.run_number }} || exit /b !errorlevel!

createrelease

-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
# Generate lib/checkers.cpp (TODO the premium checkers should not be statically coded)
2828
# cd ~/cppchecksolutions/cppcheck && python3 tools/get_checkers.py > lib/checkers.cpp
2929
#
30-
# Update translations
31-
# lupdate gui.pro
32-
#
3330
# Update copyright year
3431
# git diff 2.8 -- */*.cpp */*.h | grep '^diff --git a/' | sed 's|.* b/||' | xargs sed -i 's/Copyright (C) 2007-20[12]./Copyright (C) 2007-2022/'
3532
# git diff | grep '^diff --git a/'

0 commit comments

Comments
 (0)