feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Plugin Wizard/GitHub: Don't assume jom to be in Qt Creator package

Browse Source 
It is no longer part of the qtcreator.7z for master/4.13, but instead
packaged separately in the installer.
Get jom from its own download location.

Change-Id: I642da3f560087982612d25d288eb7a960103854b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Eike Ziller
2020-05-27 16:37:08 +02:00
parent 1989dbe0d7
commit 24777becb9
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_build_qmake.yml
View File

@@ -45,6 +45,11 @@ jobs:
execute_process( execute_process(
COMMAND sudo apt install libgl1-mesa-dev COMMAND sudo apt install libgl1-mesa-dev
) )
elseif ("${{ runner.os }}" STREQUAL "Windows")
# get JOM
file(DOWNLOAD "https://download.qt.io/official_releases/jom/jom.zip" ./jom.zip SHOW_PROGRESS)
file(MAKE_DIRECTORY ./jom)
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf ../jom.zip WORKING_DIRECTORY ./jom)
endif() endif()
- name: Download Qt - name: Download Qt
@@ -210,7 +215,7 @@ jobs:
set(make_program make -j ${N}) set(make_program make -j ${N})
if ("${{ runner.os }}" STREQUAL "Windows") if ("${{ runner.os }}" STREQUAL "Windows")
set(make_program "qtcreator/bin/jom") set(make_program "jom/jom")
endif() endif()
execute_process( execute_process(