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

Github: Cleanup workflow template

Browse Source 
* Bumps qt-creator/install-dev-package to version 2.0
* Removes unnecessary/empty "Extract Qt Creator" step

Change-Id: I1101aabaa42b54db5190b339b9c7de3b9ad9c583
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Marcus Tillmanns
2025-02-04 09:17:01 +01:00
parent d275c50c03
commit 4cbbeec12d
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
share/qtcreator/templates/wizards/qtcreatorplugin/github_workflows_build_cmake.yml
View File

@@ -6,7 +6,6 @@ env:
PLUGIN_NAME: %{PluginName} PLUGIN_NAME: %{PluginName}
QT_VERSION: %{JS: Util.qtVersion()} QT_VERSION: %{JS: Util.qtVersion()}
QT_CREATOR_VERSION: %{JS: Util.qtCreatorVersion()} QT_CREATOR_VERSION: %{JS: Util.qtCreatorVersion()}
QT_CREATOR_VERSION_INTERNAL: %{JS: Util.qtCreatorIdeVersion()}
MACOS_DEPLOYMENT_TARGET: "11.0" MACOS_DEPLOYMENT_TARGET: "11.0"
CMAKE_VERSION: "3.29.6" CMAKE_VERSION: "3.29.6"
NINJA_VERSION: "1.12.1" NINJA_VERSION: "1.12.1"
@@ -206,19 +205,13 @@ jobs:
endif() endif()
- name: Download Qt Creator - name: Download Qt Creator
uses: qt-creator/install-dev-package@v1.6 id: qt_creator
uses: qt-creator/install-dev-package@v2.0
with: with:
version: ${{ env.QT_CREATOR_VERSION }} version: ${{ env.QT_CREATOR_VERSION }}
unzip-to: 'qtcreator' unzip-to: 'qtcreator'
platform: ${{ matrix.config.platform }} platform: ${{ matrix.config.platform }}
- name: Extract Qt Creator
id: qt_creator
shell: cmake -P {0}
run: |
file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/qtcreator" qtc_dir)
file(APPEND "$ENV{GITHUB_OUTPUT}" "qtc_dir=${qtc_dir}")
- name: Build - name: Build
shell: cmake -P {0} shell: cmake -P {0}
run: | run: |
@@ -246,7 +239,7 @@ jobs:
set(build_plugin_py "scripts/build_plugin.py") set(build_plugin_py "scripts/build_plugin.py")
foreach(dir "share/qtcreator/scripts" "Qt Creator.app/Contents/Resources/scripts" "Contents/Resources/scripts") foreach(dir "share/qtcreator/scripts" "Qt Creator.app/Contents/Resources/scripts" "Contents/Resources/scripts")
if(EXISTS "${{ steps.qt_creator.outputs.qtc_dir }}/${dir}/build_plugin.py") if(EXISTS "${{ steps.qt_creator.outputs.path }}/${dir}/build_plugin.py")
set(build_plugin_py "${dir}/build_plugin.py") set(build_plugin_py "${dir}/build_plugin.py")
break() break()
endif() endif()
@@ -263,12 +256,12 @@ jobs:
execute_process( execute_process(
COMMAND python COMMAND python
-u -u
"${{ steps.qt_creator.outputs.qtc_dir }}/${build_plugin_py}" "${{ steps.qt_creator.outputs.path }}/${build_plugin_py}"
--name "$ENV{PLUGIN_NAME}-$ENV{QT_CREATOR_VERSION}-${{ matrix.config.artifact }}" --name "$ENV{PLUGIN_NAME}-$ENV{QT_CREATOR_VERSION}-${{ matrix.config.artifact }}"
--src . --src .
--build build --build build
--qt-path "${{ steps.qt.outputs.qt_dir }}" --qt-path "${{ steps.qt.outputs.qt_dir }}"
--qtc-path "${{ steps.qt_creator.outputs.qtc_dir }}" --qtc-path "${{ steps.qt_creator.outputs.path }}"
--output-path "$ENV{GITHUB_WORKSPACE}" --output-path "$ENV{GITHUB_WORKSPACE}"
${additional_config} ${additional_config}
RESULT_VARIABLE result RESULT_VARIABLE result