From 4cbaf4106afc826a65c231cb0c4f50a82f467af1 Mon Sep 17 00:00:00 2001 From: JesusPoderoso Date: Mon, 2 Sep 2024 10:43:15 +0200 Subject: [PATCH 1/4] Refs #21535: Add external action to install Qt Signed-off-by: JesusPoderoso --- external/install_qt/action.yml | 39 ++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 external/install_qt/action.yml diff --git a/external/install_qt/action.yml b/external/install_qt/action.yml new file mode 100644 index 00000000..95084cf7 --- /dev/null +++ b/external/install_qt/action.yml @@ -0,0 +1,39 @@ +name: 'install_qt' +description: 'https://github.com/jurplel/install-qt-action' + +inputs: + version: + description: "The desired version of Qt to install" + type: string + default: '5.15.2' + target: + description: "The target platform to install Qt on" + type: string + default: 'desktop' + dir: + description: "The directory to install Qt in" + install-deps: + description: "Whether to install dependencies" + type: boolean + default: true + modules: + description: "The Qt modules to install" + type: string + default: '' + setup-python: + description: "Whether to setup Python" + type: boolean + default: true + +runs: + using: composite + steps: + - name: Install Qt + uses: jurplel/install-qt-action@v4.0.0 + with: + version: ${{ inputs.version }} + target: ${{ inputs.target }} + dir: ${{ inputs.dir }} + install-deps: ${{ inputs.install-deps }} + modules: ${{ inputs.modules }} + setup-python: ${{ inputs.setup-python }} From 3f848c7d927018e57a0864e45e767baab8c11bed Mon Sep 17 00:00:00 2001 From: JesusPoderoso Date: Mon, 2 Sep 2024 10:45:49 +0200 Subject: [PATCH 2/4] Refs #21535: Update readme and versions Signed-off-by: JesusPoderoso --- README.md | 1 + versions.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index bba5ceb6..d1dd7396 100644 --- a/README.md +++ b/README.md @@ -269,6 +269,7 @@ Find below the external actions listed: | [create-pull-request](external/create-pull-request/action.yml) | Create PR | MIT license | | [get-cmake](external/get-cmake/action.yml) | Installs desired versions of CMake and Ninja | Mit license | | [install_doxygen](external/install_doxygen/action.yml) | Multi-platform action that installs doxygen | Mit license | +| [install_qt](external/install_qt/action.yml) | Multi-platform action that installs Qt | MIT license | | [mirror-branch-action](external/mirror-branch-action/action.yml) | Mirror branch within the same repository | Apache-2.0 license | | [remove_labels](external/remove_labels/action.yml) | Remove labels from an issue or PR | Apache-2.0 license | | [setup-ccache-action](external/setup-ccache-action/action.yml) | Setup CCache in a workflow | MIT license | diff --git a/versions.md b/versions.md index 4d129897..90640e2e 100644 --- a/versions.md +++ b/versions.md @@ -39,6 +39,7 @@ The [Forthcoming](#forthcoming) section includes those features added in `main` The upcoming release will include the following **features**: - Add `skip_base` option to the `get_related_branch_from_repo` action so base branch is not considered. +- Add external (multi-platform) action to install Qt. ## v0.24.0 From d6591ade3887ebf7799c98d56952799ad1c036a4 Mon Sep 17 00:00:00 2001 From: JesusPoderoso Date: Mon, 2 Sep 2024 11:03:11 +0200 Subject: [PATCH 3/4] Refs #21535: Add missing 'arch' input Signed-off-by: JesusPoderoso --- external/install_qt/action.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/external/install_qt/action.yml b/external/install_qt/action.yml index 95084cf7..5b086b93 100644 --- a/external/install_qt/action.yml +++ b/external/install_qt/action.yml @@ -16,6 +16,10 @@ inputs: description: "Whether to install dependencies" type: boolean default: true + arch: + description: "The architecture to install Qt for" + type: string + default: 'gcc_64' modules: description: "The Qt modules to install" type: string From 0792c568a192f4d333ad2764c5cfa778d674a3ef Mon Sep 17 00:00:00 2001 From: JesusPoderoso Date: Mon, 2 Sep 2024 15:54:15 +0200 Subject: [PATCH 4/4] Refs #21535: Apply rev suggestion Signed-off-by: JesusPoderoso --- external/install_qt/action.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/external/install_qt/action.yml b/external/install_qt/action.yml index 5b086b93..634e967d 100644 --- a/external/install_qt/action.yml +++ b/external/install_qt/action.yml @@ -1,5 +1,8 @@ name: 'install_qt' -description: 'https://github.com/jurplel/install-qt-action' +description: > + https://github.com/jurplel/install-qt-action + There are more possible inputs used in the original action, but these are the most used by eProsima. + Please, refer to the original action for more information. inputs: version: @@ -10,16 +13,16 @@ inputs: description: "The target platform to install Qt on" type: string default: 'desktop' + arch: + description: "The architecture to install Qt for" + type: string + default: 'gcc_64' dir: description: "The directory to install Qt in" install-deps: description: "Whether to install dependencies" type: boolean default: true - arch: - description: "The architecture to install Qt for" - type: string - default: 'gcc_64' modules: description: "The Qt modules to install" type: string @@ -28,7 +31,7 @@ inputs: description: "Whether to setup Python" type: boolean default: true - + # Other inputs as tools, source, documentation, examples, etc. are not included here, but can be added if needed. runs: using: composite steps: @@ -37,7 +40,9 @@ runs: with: version: ${{ inputs.version }} target: ${{ inputs.target }} + arch: ${{ inputs.arch }} dir: ${{ inputs.dir }} install-deps: ${{ inputs.install-deps }} modules: ${{ inputs.modules }} setup-python: ${{ inputs.setup-python }} + # Other inputs as tools, source, documentation, examples, etc. are not included, but can be added if needed.