diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-05-27 16:37:08 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-05-28 09:05:20 +0000 |
| commit | 24777becb91357a8dbade3b1744622d23c2d0da4 (patch) | |
| tree | 0cd3cadd46f3d00020672d205bf0282f5476f892 | |
| parent | 1989dbe0d7e3691f8bb903003204c2921b32f2ac (diff) | |
| download | qt-creator-24777becb91357a8dbade3b1744622d23c2d0da4.tar.gz | |
Plugin Wizard/GitHub: Don't assume jom to be in Qt Creator package
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>
| -rw-r--r-- | share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_build_qmake.yml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_build_qmake.yml b/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_build_qmake.yml index 9cf6aa0782..17ffdfe9bf 100644 --- a/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_build_qmake.yml +++ b/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_build_qmake.yml @@ -45,6 +45,11 @@ jobs: execute_process( 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() - name: Download Qt @@ -210,7 +215,7 @@ jobs: set(make_program make -j ${N}) if ("${{ runner.os }}" STREQUAL "Windows") - set(make_program "qtcreator/bin/jom") + set(make_program "jom/jom") endif() execute_process( |