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

Fix github actions for Qt Creator plugin wizard

Browse Source 
For Qt Creator 4.13
- rename directory to 'workflows'
- use MSVC 2019 for Qt
- fix Qt Creator platform names
- don't use GitHub's now deprected set-env

Fixes: QTCREATORBUG-24412
Change-Id: Ifdd3e95da74fef4ad9f65ae2c084ff82b2ca1972
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Eike Ziller
2020-10-09 15:46:31 +02:00
parent 80dda222e0
commit f21d0b531f
4 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_README.md → share/qtcreator/templates/wizards/qtcreatorplugin/github_workflows_README.md
View File

22
share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_build_qmake.yml → share/qtcreator/templates/wizards/qtcreatorplugin/github_workflows_build_qmake.yml
View File

@@ -62,11 +62,11 @@ jobs:
if ("${{ runner.os }}" STREQUAL "Windows")
set(url_os "windows_x86")
if ("${{ matrix.config.environment_script }}" MATCHES "vcvars64.bat")
set(qt_package_name "qt.qt5.${qt_version_dotless}.win64_msvc2017_64")
set(qt_dir_prefix "${qt_version}/msvc2017_64")
set(qt_package_name "qt.qt5.${qt_version_dotless}.win64_msvc2019_64")
set(qt_dir_prefix "${qt_version}/msvc2019_64")
elseif ("${{ matrix.config.environment_script }}" MATCHES "vcvars32.bat")
set(qt_package_name "qt.qt5.${qt_version_dotless}.win32_msvc2017")
set(qt_dir_prefix "${qt_version}/msvc2017")
set(qt_package_name "qt.qt5.${qt_version_dotless}.win32_msvc2019")
set(qt_dir_prefix "${qt_version}/msvc2019")
else()
endif()
elseif ("${{ runner.os }}" STREQUAL "Linux")
@@ -131,14 +131,14 @@ jobs:
set(qtc_output_directory "qtcreator/lib/qtcreator/plugins")
set(qtc_binary_name "$ENV{PLUGIN_NAME}4.dll")
if ("${{ matrix.config.environment_script }}" MATCHES "vcvars64.bat")
set(qtc_platform "windows_msvc2017_x64")
set(qtc_platform "windows_x64")
elseif ("${{ matrix.config.environment_script }}" MATCHES "vcvars32.bat")
set(qtc_platform "windows_msvc2017_x86")
set(qtc_platform "windows_x86")
endif()
elseif ("${{ runner.os }}" STREQUAL "Linux")
set(qtc_output_directory "qtcreator/lib/qtcreator/plugins")
set(qtc_binary_name "lib$ENV{PLUGIN_NAME}.so")
set(qtc_platform "linux_gcc_64_rhel72")
set(qtc_platform "linux_x64")
elseif ("${{ runner.os }}" STREQUAL "macOS")
set(qtc_output_directory "qtcreator/bin/Qt Creator.app/Contents/PlugIns")
set(qtc_binary_name "lib$ENV{PLUGIN_NAME}.dylib")
@@ -167,7 +167,7 @@ jobs:
)
endif()
- name: Configure
- name: Build
shell: cmake -P {0}
run: |
if ("${{ runner.os }}" STREQUAL "Windows" AND NOT "x${{ matrix.config.environment_script }}" STREQUAL "x")
@@ -179,9 +179,6 @@ jobs:
foreach(line IN LISTS output_lines)
if (line MATCHES "^([a-zA-Z0-9_-]+)=(.*)$")
set(ENV{${CMAKE_MATCH_1}} "${CMAKE_MATCH_2}")
# Set for other steps
message("::set-env name=${CMAKE_MATCH_1}::${CMAKE_MATCH_2}")
endif()
endforeach()
endif()
@@ -200,9 +197,6 @@ jobs:
message(FATAL_ERROR "Bad exit status")
endif()
- name: Build
shell: cmake -P {0}
run: |
if ("${{ runner.os }}" STREQUAL "Windows")
set(ENV{PATH} "${{ steps.qt.outputs.qt_dir }}/bin/;$ENV{PATH}")
else()

4
share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro
View File

@@ -11,8 +11,8 @@ HEADERS += \\
%{ConstantsHdrFileName}
DISTFILES += \\
.github/workflow/build_qmake.yml \\
.github/workflow/README.md
.github/workflows/build_qmake.yml \\
.github/workflows/README.md
# Qt Creator linking

8
share/qtcreator/templates/wizards/qtcreatorplugin/wizard.json
View File

@@ -190,12 +190,12 @@
"openAsProject": true
},
{
"source": "github_workflow_build_qmake.yml",
"target": ".github/workflow/build_qmake.yml"
"source": "github_workflows_build_qmake.yml",
"target": ".github/workflows/build_qmake.yml"
},
{
"source": "github_workflow_README.md",
"target": ".github/workflow/README.md"
"source": "github_workflows_README.md",
"target": ".github/workflows/README.md"
},
{
"source": "myplugin.cpp",