@@ -50,59 +50,18 @@ jobs:
5050
5151 - name : Download Qt
5252 id : qt
53- uses : jurplel /install-qt-action@v2
53+ uses : fpoussin /install-qt-action@v2
5454 with :
55+ aqtversion : master
5556 version : " ${{ env.QT_VERSION }}"
5657 modules : qtdeclarative qttools qtsvg
58+ tools :
59+ - name : qtcreator
60+ version : " ${{ env.QT_CREATOR_VERSION }}"
61+ - name : qtcreatordev
62+ version : " ${{ env.QT_CREATOR_VERSION }}"
5763 arch : " ${{ matrix.config.msvc }}"
5864
59- - name : Download Qt Creator
60- id : qt_creator
61- shell : cmake -P {0}
62- run : |
63- string(REGEX MATCH "([0-9]+.[0-9]+).[0-9]+" outvar "$ENV{QT_CREATOR_VERSION}")
64- set(qtc_base_url "https://download.qt.io/official_releases/qtcreator/${CMAKE_MATCH_1}/$ENV{QT_CREATOR_VERSION}")
65-
66- if ("${{ runner.os }}" STREQUAL "Windows")
67- set(qtc_output_directory "qtcreator/lib/qtcreator/plugins")
68- set(qtc_binary_name "$ENV{PLUGIN_NAME}4.dll")
69- if ("${{ matrix.config.environment_script }}" MATCHES "vcvars64.bat")
70- set(qtc_platform "windows_msvc2017_x64")
71- elseif ("${{ matrix.config.environment_script }}" MATCHES "vcvars32.bat")
72- set(qtc_platform "windows_msvc2017_x86")
73- endif()
74- elseif ("${{ runner.os }}" STREQUAL "Linux")
75- set(qtc_output_directory "qtcreator/lib/qtcreator/plugins")
76- set(qtc_binary_name "lib$ENV{PLUGIN_NAME}.so")
77- set(qtc_platform "linux_gcc_64_rhel72")
78- elseif ("${{ runner.os }}" STREQUAL "macOS")
79- set(qtc_output_directory "qtcreator/bin/Qt Creator.app/Contents/PlugIns")
80- set(qtc_binary_name "lib$ENV{PLUGIN_NAME}.dylib")
81- set(qtc_platform "mac_x64")
82- endif()
83-
84- # Save the path for other steps
85- message("::set-output name=qtc_binary_name::${qtc_binary_name}")
86- message("::set-output name=qtc_output_directory::${qtc_output_directory}")
87-
88- file(MAKE_DIRECTORY qtcreator)
89-
90- foreach(package qtcreator qtcreator_dev)
91- file(DOWNLOAD
92- "${qtc_base_url}/installer_source/${qtc_platform}/${package}.7z" ./${package}.7z SHOW_PROGRESS)
93- execute_process(COMMAND
94- ${CMAKE_COMMAND} -E tar xvf ../${package}.7z WORKING_DIRECTORY qtcreator)
95- endforeach()
96-
97- if ("${{ runner.os }}" STREQUAL "macOS")
98- execute_process(
99- COMMAND ${CMAKE_COMMAND} -E make_directory qtcreator/bin
100- COMMAND ${CMAKE_COMMAND} -E create_symlink
101- "$ENV{GITHUB_WORKSPACE}/qtcreator/Qt Creator.app"
102- "$ENV{GITHUB_WORKSPACE}/qtcreator/bin/Qt Creator.app"
103- )
104- endif()
105-
10665 - name : Configure
10766 shell : cmake -P {0}
10867 run : |
0 commit comments