Commit 6e70c4f4 authored by Victor Yacovlev's avatar Victor Yacovlev

Fixed out file naming for GitLab CI

parent 027ff929
Pipeline #348 passed with stages
in 28 minutes and 47 seconds
......@@ -48,46 +48,46 @@ dist:win32:
stage: dist
script:
- cd build
- md kumir2-master-%CI_PIPELINE_ID%\
- md kumir2-master-%CI_PIPELINE_ID%\bin\
- md kumir2-master-%CI_PIPELINE_ID%\lib\
- md kumir2-master-%CI_PIPELINE_ID%\share\
- xcopy /Y /S /E bin kumir2-master-%CI_PIPELINE_ID%\bin
- xcopy /Y /S /E lib kumir2-master-%CI_PIPELINE_ID%\lib
- xcopy /Y /S /E share kumir2-master-%CI_PIPELINE_ID%\share
- copy /Y ..\LICENSE_RU.rtf kumir2-master-%CI_PIPELINE_ID%\
- copy /Y %QTDIR%\bin\Qt5Core.dll kumir2-master-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Gui.dll kumir2-master-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Multimedia.dll kumir2-master-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5MultimediaWidgets.dll kumir2-master-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Network.dll kumir2-master-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5OpenGL.dll kumir2-master-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Positioning.dll kumir2-master-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5PrintSupport.dll kumir2-master-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Qml.dll kumir2-master-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Quick.dll kumir2-master-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Script.dll kumir2-master-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Sensors.dll kumir2-master-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Sql.dll kumir2-master-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Svg.dll kumir2-master-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Widgets.dll kumir2-master-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Xml.dll kumir2-master-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5XmlPatterns.dll kumir2-master-%CI_PIPELINE_ID%\bin\
- md kumir2-master-%CI_PIPELINE_ID%\bin\platforms
- copy /Y %QTDIR%\plugins\platforms\qminimal.dll kumir2-master-%CI_PIPELINE_ID%\bin\platforms\
- copy /Y %QTDIR%\plugins\platforms\qwindows.dll kumir2-master-%CI_PIPELINE_ID%\bin\platforms\
- copy /Y %QTDIR%\plugins\platforms\qdirect2d.dll kumir2-master-%CI_PIPELINE_ID%\bin\platforms\
- copy /Y %QTDIR%\plugins\platforms\qoffscreen.dll kumir2-master-%CI_PIPELINE_ID%\bin\platforms\
- xcopy /Y /S /E "%VC_REDIST_DIR%\x86\Microsoft.VC140.CRT\*.dll" kumir2-master-%CI_PIPELINE_ID%\bin\
- upx -9 kumir2-master-%CI_PIPELINE_ID%\bin\*.exe
- upx -9 kumir2-master-%CI_PIPELINE_ID%\bin\*.dll
- md kumir2-master-%CI_PIPELINE_ID%\src
- md kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\
- md kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\
- md kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\lib\
- md kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\share\
- xcopy /Y /S /E bin kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin
- xcopy /Y /S /E lib kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\lib
- xcopy /Y /S /E share kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\share
- copy /Y ..\LICENSE_RU.rtf kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\
- copy /Y %QTDIR%\bin\Qt5Core.dll kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Gui.dll kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Multimedia.dll kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5MultimediaWidgets.dll kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Network.dll kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5OpenGL.dll kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Positioning.dll kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5PrintSupport.dll kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Qml.dll kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Quick.dll kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Script.dll kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Sensors.dll kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Sql.dll kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Svg.dll kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Widgets.dll kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5Xml.dll kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\
- copy /Y %QTDIR%\bin\Qt5XmlPatterns.dll kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\
- md kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\platforms
- copy /Y %QTDIR%\plugins\platforms\qminimal.dll kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\platforms\
- copy /Y %QTDIR%\plugins\platforms\qwindows.dll kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\platforms\
- copy /Y %QTDIR%\plugins\platforms\qdirect2d.dll kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\platforms\
- copy /Y %QTDIR%\plugins\platforms\qoffscreen.dll kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\platforms\
- xcopy /Y /S /E "%VC_REDIST_DIR%\x86\Microsoft.VC140.CRT\*.dll" kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\
- upx -9 kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\*.exe
- upx -9 kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\bin\*.dll
- md kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\src
- cd ..
- call %PYTHON_EXECUTABLE% scripts\get_bundle_name.py --prefix=git@20archive@20--out=build\kumir2-master-%CI_PIPELINE_ID%\src\kumir2- --suffix=.src.zip@20--format=zip@20-9@20HEAD --out=run_git_archive.cmd
- copy /Y kumir2.nsi build\kumir2-master-%CI_PIPELINE_ID%\
- copy /Y kumir2.nsi build\kumir2-master-%CI_PIPELINE_ID%\src\
- call %PYTHON_EXECUTABLE% scripts\query_version_info.py --mode=nsis_include_file --out=build\kumir2-master-%CI_PIPELINE_ID%\nsis_version_info.nsh
- copy /Y build\kumir2-master-%CI_PIPELINE_ID%\nsis_version_info.nsh build\kumir2-master-%CI_PIPELINE_ID%\src\
- call %PYTHON_EXECUTABLE% scripts\get_bundle_name.py --prefix=git@20archive@20--out=build\kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\src\kumir2- --suffix=.src.zip@20--format=zip@20-9@20HEAD --out=run_git_archive.cmd
- copy /Y kumir2.nsi build\kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\
- copy /Y kumir2.nsi build\kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\src\
- call %PYTHON_EXECUTABLE% scripts\query_version_info.py --mode=nsis_include_file --out=build\kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\nsis_version_info.nsh
- copy /Y build\kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\nsis_version_info.nsh build\kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%\src\
- run_git_archive.cmd
tags:
- windows
......@@ -101,9 +101,9 @@ pack:win32:
stage: pack
script:
- cd build
- cd kumir2-master-%CI_PIPELINE_ID%
- cd kumir2-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%
- call "%NSIS_EXECUTABLE%" kumir2.nsi
- move /Y kumir2-master-%CI_PIPELINE_ID%-install.exe ..\..\
- move /Y kumir2-*-install.exe ..\..\
cache:
key: $CI_PIPELINE_ID
untracked: true
......
......@@ -94,6 +94,8 @@ def get_version_information(top_level_dir):
else:
result["taggedRelease"] = False
result["date"] = get_date(top_level_dir)
if not result["taggedRelease"] and result["branch"]=="HEAD":
result["branch"] = "master" # fix GitLab naming bug
return result
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment