@@ -56,56 +56,25 @@ jobs:
5656 modules : qtdeclarative qttools qtsvg
5757 tools : ' tools_qtcreator,"${{ env.QT_CREATOR_VERSION }}"-0,qt.tools.qtcreator tools_qtcreator,"${{ env.QT_CREATOR_VERSION }}"-0,qt.tools.qtcreatordev'
5858
59- - name : Configure
59+ - name : Prepare
6060 shell : cmake -P {0}
6161 run : |
62- if ("${{ runner.os }}" STREQUAL "Windows" AND NOT "x${{ matrix.config.environment_script }}" STREQUAL "x")
63- execute_process(
64- COMMAND "${{ matrix.config.environment_script }}" && set
65- OUTPUT_FILE environment_script_output.txt
66- )
67- file(STRINGS environment_script_output.txt output_lines)
68- foreach(line IN LISTS output_lines)
69- if (line MATCHES "^([a-zA-Z0-9_-]+)=(.*)$")
70- set(ENV{${CMAKE_MATCH_1}} "${CMAKE_MATCH_2}")
71-
72- # Set for other steps
73- message("::set-env name=${CMAKE_MATCH_1}::${CMAKE_MATCH_2}")
74- endif()
75- endforeach()
76- endif()
77-
78- file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/qtcreator" qtcreator_dir)
79-
80- execute_process(
81- COMMAND qmake
82- $ENV{PLUGIN_PRO}
83- CONFIG+=release
84- QTC_SOURCE="${qtcreator_dir}"
85- QTC_BUILD="${qtcreator_dir}"
86- RESULT_VARIABLE result
87- )
88- if (NOT result EQUAL 0)
89- message(FATAL_ERROR "Bad exit status")
90- endif()
62+ file(GLOB LIB_FILES "$ENV{GITHUB_WORKSPACE}/qtcreator/lib/qtcreator/*")
63+ file(COPY "${LIB_FILES}" "$ENV{GITHUB_WORKSPACE}/qtcreator/dev/lib/")
64+ if (NOT result EQUAL 0)
65+ message(FATAL_ERROR "Bad exit status")
66+ endif()
9167
9268 - name : Build
9369 shell : cmake -P {0}
9470 run : |
95- if (NOT "${{ runner.os }}" STREQUAL "Windows")
96- set(ENV{LD_LIBRARY_PATH} "qtcreator/lib/Qt/lib:$ENV{LD_LIBRARY_PATH}")
97- endif()
71+ set(ENV{CMAKE_PREFIX_PATH} "$ENV{GITHUB_WORKSPACE}/qtcreator/dev:ENV{Qt5_DIR}")
9872
9973 include(ProcessorCount)
10074 ProcessorCount(N)
10175
102- set(make_program make -j ${N})
103- if ("${{ runner.os }}" STREQUAL "Windows")
104- set(make_program "qtcreator/bin/jom")
105- endif()
106-
10776 execute_process(
108- COMMAND ${make_program }
77+ COMMAND ${CMAKE_COMMAND }
10978 RESULT_VARIABLE result
11079 )
11180 if (NOT result EQUAL 0)
0 commit comments