From fd0b55a822395b6b8799518afbd7a8940e583eee Mon Sep 17 00:00:00 2001 From: EduPonz Date: Wed, 6 Dec 2023 07:56:04 +0100 Subject: [PATCH 1/9] Refs #20091: Add support for running Fast DDS CI on macOS Signed-off-by: EduPonz --- macos/install_brew_packages/action.yml | 45 +++++++++++++++++++++ macos/install_colcon/action.yml | 18 +++++++++ macos/install_python_packages/action.yml | 51 ++++++++++++++++++++++++ multiplatform/colcon_build/action.yml | 8 ++-- multiplatform/colcon_test/action.yml | 6 +-- 5 files changed, 121 insertions(+), 7 deletions(-) create mode 100644 macos/install_brew_packages/action.yml create mode 100644 macos/install_colcon/action.yml create mode 100644 macos/install_python_packages/action.yml diff --git a/macos/install_brew_packages/action.yml b/macos/install_brew_packages/action.yml new file mode 100644 index 00000000..0ab677bc --- /dev/null +++ b/macos/install_brew_packages/action.yml @@ -0,0 +1,45 @@ +name: 'install_brew_packages' +description: 'Install brew packages' + +inputs: + + packages: + description: 'Custom packages to install using brew' + required: true + + update: + description: 'Update brew' + required: false + default: true + + upgrade: + description: 'Upgrade already installed brew packages' + required: false + default: false + +runs: + using: composite + steps: + + - name: install_brew_packages + run: | + + echo "::group::Install brew packages ${{ inputs.packages }}" + + # Update brew repos + if [ "${{ inputs.update }}" = "true" ]; then + brew update + fi + + # Install custom packages + brew install \ + ${{ inputs.packages }} + + # Upgrade brew repos + if [ "${{ inputs.upgrade }}" = "true" ]; then + brew upgrade + fi + + echo "::endgroup::" + + shell: bash diff --git a/macos/install_colcon/action.yml b/macos/install_colcon/action.yml new file mode 100644 index 00000000..d639003d --- /dev/null +++ b/macos/install_colcon/action.yml @@ -0,0 +1,18 @@ +name: 'install_colcon' +description: 'Install colcon' + +runs: + using: composite + steps: + + - name: Install colcon + uses: eProsima/eProsima-CI/macos/install_python_packages@feature/fastdds_mac_ci_support + with: + packages: 'setuptools==58.3.0 colcon-common-extensions colcon-mixin' + upgrade: true + + - name: Download default colcon mixin + shell: bash + run: | + colcon mixin add default https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml + colcon mixin update default diff --git a/macos/install_python_packages/action.yml b/macos/install_python_packages/action.yml new file mode 100644 index 00000000..2c7b6ce9 --- /dev/null +++ b/macos/install_python_packages/action.yml @@ -0,0 +1,51 @@ +name: 'install_python_packages' +description: 'Install generic and required python packages with pip' + +inputs: + + packages: + description: 'Custom packages to install using pip' + required: false + default: '' + + upgrade: + description: 'Upgrade already installed packages' + required: false + default: false + + requirements_file_name: + description: 'If set, the file name of a requirements.txt file' + required: false + default: '' + +runs: + using: composite + steps: + + - name: install_python_packages + run: | + + echo "::group::Install Python packages" + + # Set upgrade flag + if [ "${{ inputs.upgrade }}" = "true" ]; then + export UPGRADE_FLAG="--upgrade" + else + export UPGRADE_FLAG="" + fi + + # Install python packages if any + if [[ ! -z "${{ inputs.packages }}" ]] ; then + pip3 install ${UPGRADE_FLAG} -U \ + ${{ inputs.packages }} + fi + + # Install requirements file if any + if [[ ! -z "${{ inputs.requirements_file_name }}" ]] ; then + pip3 install ${UPGRADE_FLAG} -U \ + -r ${{ inputs.requirements_file_name }} + fi + + echo "::endgroup::" + + shell: bash diff --git a/multiplatform/colcon_build/action.yml b/multiplatform/colcon_build/action.yml index 0013a142..991a625f 100644 --- a/multiplatform/colcon_build/action.yml +++ b/multiplatform/colcon_build/action.yml @@ -47,9 +47,9 @@ runs: using: composite steps: - - name: Run in ubuntu - uses: eProsima/eProsima-CI/ubuntu/colcon_build@main - if: runner.os == 'Linux' + - name: Run in ubuntu or macOS + uses: eProsima/eProsima-CI/ubuntu/colcon_build@v0 + if: runner.os == 'Linux' || runner.os == 'macOS' with: colcon_meta_file: ${{ inputs.colcon_meta_file }} colcon_build_args: ${{ inputs.colcon_build_args }} @@ -61,7 +61,7 @@ runs: cmake_build_type: ${{ inputs.cmake_build_type }} - name: Run in windows - uses: eProsima/eProsima-CI/windows/colcon_build@main + uses: eProsima/eProsima-CI/windows/colcon_build@v0 if: runner.os == 'Windows' with: colcon_meta_file: ${{ inputs.colcon_meta_file }} diff --git a/multiplatform/colcon_test/action.yml b/multiplatform/colcon_test/action.yml index b9eab9aa..1d973dea 100644 --- a/multiplatform/colcon_test/action.yml +++ b/multiplatform/colcon_test/action.yml @@ -53,10 +53,10 @@ runs: using: composite steps: - - name: Run in ubuntu - id: test_ubuntu + - name: Run in ubuntu or macOS + id: test_ubuntu_mac uses: eProsima/eProsima-CI/ubuntu/colcon_test@main - if: runner.os == 'Linux' + if: runner.os == 'Linux' || runner.os == 'macOS' with: colcon_test_args: ${{ inputs.colcon_test_args }} colcon_test_args_default: ${{ inputs.colcon_test_args_default }} From 89b9952a1f3dfa33605ab7c7e38109a3394bb889 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Wed, 6 Dec 2023 09:25:58 +0100 Subject: [PATCH 2/9] Refs #20091: Do not upgrade python packages on colcon installation Signed-off-by: EduPonz --- macos/install_colcon/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macos/install_colcon/action.yml b/macos/install_colcon/action.yml index d639003d..cac0c5d7 100644 --- a/macos/install_colcon/action.yml +++ b/macos/install_colcon/action.yml @@ -9,7 +9,7 @@ runs: uses: eProsima/eProsima-CI/macos/install_python_packages@feature/fastdds_mac_ci_support with: packages: 'setuptools==58.3.0 colcon-common-extensions colcon-mixin' - upgrade: true + upgrade: false - name: Download default colcon mixin shell: bash From cbcbd9688c8cc852c2f6d89b647925d94f8c3d8e Mon Sep 17 00:00:00 2001 From: EduPonz Date: Wed, 6 Dec 2023 11:08:49 +0100 Subject: [PATCH 3/9] Refs #20091: Workspace is mandatory in colcon_test multiplatform action Signed-off-by: EduPonz --- multiplatform/colcon_test/action.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/multiplatform/colcon_test/action.yml b/multiplatform/colcon_test/action.yml index 1d973dea..181df026 100644 --- a/multiplatform/colcon_test/action.yml +++ b/multiplatform/colcon_test/action.yml @@ -29,8 +29,7 @@ inputs: workspace: description: 'Workspace where built has been done' - required: false - default: '' + required: true workspace_dependencies: description: 'Workspace to source where dependencies are' From eb18688592020adfb1311a96c4d6ec44d215d2d7 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Thu, 7 Dec 2023 09:11:14 +0100 Subject: [PATCH 4/9] Refs #20091: Remove sudo for pip installation Signed-off-by: EduPonz --- ubuntu/install_python_packages/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ubuntu/install_python_packages/action.yml b/ubuntu/install_python_packages/action.yml index 25a466d5..2c7b6ce9 100644 --- a/ubuntu/install_python_packages/action.yml +++ b/ubuntu/install_python_packages/action.yml @@ -36,13 +36,13 @@ runs: # Install python packages if any if [[ ! -z "${{ inputs.packages }}" ]] ; then - sudo pip3 install ${UPGRADE_FLAG} -U \ + pip3 install ${UPGRADE_FLAG} -U \ ${{ inputs.packages }} fi # Install requirements file if any if [[ ! -z "${{ inputs.requirements_file_name }}" ]] ; then - sudo pip3 install ${UPGRADE_FLAG} -U \ + pip3 install ${UPGRADE_FLAG} -U \ -r ${{ inputs.requirements_file_name }} fi From 8b7b8e465861d836e95339caaaf0e01fb7bddcf5 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Fri, 16 Feb 2024 10:20:09 +0100 Subject: [PATCH 5/9] Refs #20091: Add macos actions to multiplaform Signed-off-by: EduPonz --- macos/install_python_packages/action.yml | 9 ++++++--- multiplatform/colcon_build/action.yml | 4 ++-- multiplatform/colcon_test/action.yml | 6 +++--- multiplatform/install_colcon/action.yml | 8 ++++++-- multiplatform/install_gtest/action.yml | 8 ++++---- multiplatform/install_python_packages/action.yml | 12 ++++++++++-- multiplatform/junit_summary/action.yaml | 8 ++++---- ubuntu/colcon_test/action.yml | 4 ++-- ubuntu/install_colcon/action.yml | 2 +- 9 files changed, 38 insertions(+), 23 deletions(-) diff --git a/macos/install_python_packages/action.yml b/macos/install_python_packages/action.yml index 2c7b6ce9..7ff71e24 100644 --- a/macos/install_python_packages/action.yml +++ b/macos/install_python_packages/action.yml @@ -28,20 +28,23 @@ runs: echo "::group::Install Python packages" # Set upgrade flag - if [ "${{ inputs.upgrade }}" = "true" ]; then + if [[ "${{ inputs.upgrade }}" == "true" ]] + then export UPGRADE_FLAG="--upgrade" else export UPGRADE_FLAG="" fi # Install python packages if any - if [[ ! -z "${{ inputs.packages }}" ]] ; then + if [[ ! -z "${{ inputs.packages }}" ]] + then pip3 install ${UPGRADE_FLAG} -U \ ${{ inputs.packages }} fi # Install requirements file if any - if [[ ! -z "${{ inputs.requirements_file_name }}" ]] ; then + if [[ ! -z "${{ inputs.requirements_file_name }}" ]] + then pip3 install ${UPGRADE_FLAG} -U \ -r ${{ inputs.requirements_file_name }} fi diff --git a/multiplatform/colcon_build/action.yml b/multiplatform/colcon_build/action.yml index 991a625f..c74e2ec7 100644 --- a/multiplatform/colcon_build/action.yml +++ b/multiplatform/colcon_build/action.yml @@ -48,7 +48,7 @@ runs: steps: - name: Run in ubuntu or macOS - uses: eProsima/eProsima-CI/ubuntu/colcon_build@v0 + uses: eProsima/eProsima-CI/ubuntu/colcon_build@feature/fastdds_mac_ci_support if: runner.os == 'Linux' || runner.os == 'macOS' with: colcon_meta_file: ${{ inputs.colcon_meta_file }} @@ -61,7 +61,7 @@ runs: cmake_build_type: ${{ inputs.cmake_build_type }} - name: Run in windows - uses: eProsima/eProsima-CI/windows/colcon_build@v0 + uses: eProsima/eProsima-CI/windows/colcon_build@feature/fastdds_mac_ci_support if: runner.os == 'Windows' with: colcon_meta_file: ${{ inputs.colcon_meta_file }} diff --git a/multiplatform/colcon_test/action.yml b/multiplatform/colcon_test/action.yml index 181df026..894bc0a6 100644 --- a/multiplatform/colcon_test/action.yml +++ b/multiplatform/colcon_test/action.yml @@ -46,7 +46,7 @@ inputs: outputs: ctest_results_path: description: "Path to test results" - value: ${{ steps.test_ubuntu.outputs.ctest_results_path || steps.test_windows.outputs.ctest_results_path }} + value: ${{ steps.test_ubuntu_mac.outputs.ctest_results_path || steps.test_windows.outputs.ctest_results_path }} runs: using: composite @@ -54,7 +54,7 @@ runs: - name: Run in ubuntu or macOS id: test_ubuntu_mac - uses: eProsima/eProsima-CI/ubuntu/colcon_test@main + uses: eProsima/eProsima-CI/ubuntu/colcon_test@feature/fastdds_mac_ci_support if: runner.os == 'Linux' || runner.os == 'macOS' with: colcon_test_args: ${{ inputs.colcon_test_args }} @@ -68,7 +68,7 @@ runs: - name: Run in windows id: test_windows - uses: eProsima/eProsima-CI/windows/colcon_test@main + uses: eProsima/eProsima-CI/windows/colcon_test@feature/fastdds_mac_ci_support if: runner.os == 'Windows' with: colcon_test_args: ${{ inputs.colcon_test_args }} diff --git a/multiplatform/install_colcon/action.yml b/multiplatform/install_colcon/action.yml index 91a95318..40feb96e 100644 --- a/multiplatform/install_colcon/action.yml +++ b/multiplatform/install_colcon/action.yml @@ -6,9 +6,13 @@ runs: steps: - name: Run in ubuntu - uses: eProsima/eProsima-CI/ubuntu/install_colcon@main + uses: eProsima/eProsima-CI/ubuntu/install_colcon@feature/fastdds_mac_ci_support if: runner.os == 'Linux' + - name: Run in macOS + uses: eProsima/eProsima-CI/macos/install_colcon@feature/fastdds_mac_ci_support + if: runner.os == 'macOS' + - name: Run in windows - uses: eProsima/eProsima-CI/windows/install_colcon@main + uses: eProsima/eProsima-CI/windows/install_colcon@feature/fastdds_mac_ci_support if: runner.os == 'Windows' diff --git a/multiplatform/install_gtest/action.yml b/multiplatform/install_gtest/action.yml index 4df01785..416a0e2c 100644 --- a/multiplatform/install_gtest/action.yml +++ b/multiplatform/install_gtest/action.yml @@ -17,15 +17,15 @@ runs: using: composite steps: - - name: Run in ubuntu - uses: eProsima/eProsima-CI/ubuntu/install_gtest@main - if: runner.os == 'Linux' + - name: Run in ubuntu or macOS + uses: eProsima/eProsima-CI/ubuntu/install_gtest@feature/fastdds_mac_ci_support + if: runner.os == 'Linux' || runner.os == 'macOS' with: cmake_build_type: ${{ inputs.cmake_build_type }} version: ${{ inputs.version }} - name: Run in windows - uses: eProsima/eProsima-CI/windows/install_gtest@main + uses: eProsima/eProsima-CI/windows/install_gtest@feature/fastdds_mac_ci_support if: runner.os == 'Windows' with: cmake_build_type: ${{ inputs.cmake_build_type }} diff --git a/multiplatform/install_python_packages/action.yml b/multiplatform/install_python_packages/action.yml index a42ad4a0..2d0ff306 100644 --- a/multiplatform/install_python_packages/action.yml +++ b/multiplatform/install_python_packages/action.yml @@ -23,15 +23,23 @@ runs: steps: - name: Run in ubuntu - uses: eProsima/eProsima-CI/ubuntu/install_python_packages@main + uses: eProsima/eProsima-CI/ubuntu/install_python_packages@feature/fastdds_mac_ci_support if: runner.os == 'Linux' with: packages: ${{ inputs.packages }} upgrade: ${{ inputs.upgrade }} requirements_file_name: ${{ inputs.requirements_file_name }} + - name: Run in macOS + uses: eProsima/eProsima-CI/macos/install_python_packages@feature/fastdds_mac_ci_support + if: runner.os == 'macOS' + with: + packages: ${{ inputs.packages }} + upgrade: ${{ inputs.upgrade }} + requirements_file_name: ${{ inputs.requirements_file_name }} + - name: Run in windows - uses: eProsima/eProsima-CI/windows/install_python_packages@main + uses: eProsima/eProsima-CI/windows/install_python_packages@feature/fastdds_mac_ci_support if: runner.os == 'Windows' with: packages: ${{ inputs.packages }} diff --git a/multiplatform/junit_summary/action.yaml b/multiplatform/junit_summary/action.yaml index fe70a770..72be0c58 100644 --- a/multiplatform/junit_summary/action.yaml +++ b/multiplatform/junit_summary/action.yaml @@ -30,9 +30,9 @@ runs: using: composite steps: - - name: Run in ubuntu - if: runner.os == 'Linux' - uses: eProsima/eProsima-CI/ubuntu/junit_summary@main + - name: Run in ubuntu or macOS + if: runner.os == 'Linux' || runner.os == 'macOS' + uses: eProsima/eProsima-CI/ubuntu/junit_summary@feature/fastdds_mac_ci_support with: junit_reports_dir: ${{ inputs.junit_reports_dir }} print_summary: ${{ inputs.print_summary }} @@ -42,7 +42,7 @@ runs: - name: Run in windows if: runner.os == 'Windows' - uses: eProsima/eProsima-CI/windows/junit_summary@main + uses: eProsima/eProsima-CI/windows/junit_summary@feature/fastdds_mac_ci_support with: junit_reports_dir: ${{ inputs.junit_reports_dir }} print_summary: ${{ inputs.print_summary }} diff --git a/ubuntu/colcon_test/action.yml b/ubuntu/colcon_test/action.yml index a16b35df..26629673 100644 --- a/ubuntu/colcon_test/action.yml +++ b/ubuntu/colcon_test/action.yml @@ -54,7 +54,7 @@ runs: steps: - name: Install lxml - uses: eProsima/eProsima-CI/ubuntu/install_python_packages@main + uses: eProsima/eProsima-CI/ubuntu/install_python_packages@feature/fastdds_mac_ci_support with: packages: lxml @@ -118,7 +118,7 @@ runs: shell: bash - name: Upload test report in JUnit format - uses: eProsima/eProsima-CI/external/upload-artifact@main + uses: eProsima/eProsima-CI/external/upload-artifact@feature/fastdds_mac_ci_support if: ${{ ! cancelled() }} with: name: ${{ inputs.test_report_artifact || format('test_report_{0}_{1}', github.job, join(matrix.*, '_')) }} diff --git a/ubuntu/install_colcon/action.yml b/ubuntu/install_colcon/action.yml index be008d0a..afcfbe74 100644 --- a/ubuntu/install_colcon/action.yml +++ b/ubuntu/install_colcon/action.yml @@ -6,7 +6,7 @@ runs: steps: - name: Install colcon - uses: eProsima/eProsima-CI/ubuntu/install_python_packages@main + uses: eProsima/eProsima-CI/ubuntu/install_python_packages@feature/fastdds_mac_ci_support with: packages: 'setuptools==58.3.0 colcon-common-extensions colcon-mixin' upgrade: true From 91e7c9f4df3de1b190c07ff51c94e5ad49285be9 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Sun, 18 Feb 2024 13:37:21 +0100 Subject: [PATCH 6/9] Refs #20091: Bump setup-python version Signed-off-by: EduPonz --- external/setup-python/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/setup-python/action.yml b/external/setup-python/action.yml index 6c46cdca..0897a9ef 100644 --- a/external/setup-python/action.yml +++ b/external/setup-python/action.yml @@ -31,7 +31,7 @@ runs: steps: - name: Setup python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ inputs.python-version }} python-version-file: ${{ inputs.python-version-file }} From b2797d135841996b8bcfd88df300ff3d59794935 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 19 Feb 2024 14:41:37 +0100 Subject: [PATCH 7/9] Refs #20091: Set multiplatform colcon_test workspace default value Signed-off-by: EduPonz --- multiplatform/colcon_test/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/multiplatform/colcon_test/action.yml b/multiplatform/colcon_test/action.yml index 894bc0a6..eab81650 100644 --- a/multiplatform/colcon_test/action.yml +++ b/multiplatform/colcon_test/action.yml @@ -29,7 +29,8 @@ inputs: workspace: description: 'Workspace where built has been done' - required: true + required: false + default: '${{ github.workspace }}' workspace_dependencies: description: 'Workspace to source where dependencies are' From 7824cf216b64a14d7d83b1c835044cdbb3c60369 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 19 Feb 2024 20:11:36 +0100 Subject: [PATCH 8/9] Refs #20091: Bump version and document new actions in README Signed-off-by: EduPonz --- README.md | 9 +++++++++ VERSION | 4 ++-- versions.md | 16 ++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ccf33b5d..ab479e7f 100644 --- a/README.md +++ b/README.md @@ -152,6 +152,15 @@ For more information about versioning handle of this project, check following [f - Set a specific CMake version --- +### macOS + +- [install_brew_packages](macos/install_brew_packages/action.yml) + - Install brew packages. +- [install_python_packages](macos/install_python_packages/action.yml) + - Install python packages. +- [install_colcon](macos/install_colcon/action.yml) + - Install colcon and its dependencies. + ## Workflows There are several workflows implemented that build projects and upload them as artifacts. diff --git a/VERSION b/VERSION index cd9878b8..8b64394e 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ VERSION_MAJOR 0 -VERSION_MINOR 8 -VERSION_PATCH 1 +VERSION_MINOR 9 +VERSION_PATCH 0 diff --git a/versions.md b/versions.md index 5b22c9f5..a66b5f35 100644 --- a/versions.md +++ b/versions.md @@ -4,6 +4,7 @@ This file includes the released versions of **eProsima-CI** along with their con The [Forthcoming](#forthcoming) section includes those features added in `main` branch that are not yet in a stable release. - [Forthcoming](#forthcoming) +- [v0.9.0](#v0.9.0) - [v0.8.0](#v0.8.0) - [v0.7.0](#v0.7.0) - [v0.6.0](#v0.6.0) @@ -17,6 +18,21 @@ The [Forthcoming](#forthcoming) section includes those features added in `main` The upcoming release will include the following **features**: +## v0.9.0 + +This release includes the following **features**: + +- An action to install brew packages on macOS. +- An action to install python packages on macOS. +- An action to install colcon on macOS. +- macOS support through the following multiplatform actions: + - `colcon_build` + - `colcon_test` + - `install_colcon` + - `install_gtest` + - `install_python_packages` + - `junit_summary` + ## v0.8.0 This release includes the following **features**: From 7c5f3232feda336cc945f0c0e87cbf42f68d8582 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Tue, 20 Feb 2024 07:45:34 +0100 Subject: [PATCH 9/9] Refs #20091: Set actions version to main Signed-off-by: EduPonz --- macos/install_colcon/action.yml | 2 +- multiplatform/colcon_build/action.yml | 4 ++-- multiplatform/colcon_test/action.yml | 4 ++-- multiplatform/install_colcon/action.yml | 6 +++--- multiplatform/install_gtest/action.yml | 4 ++-- multiplatform/install_python_packages/action.yml | 6 +++--- multiplatform/junit_summary/action.yaml | 4 ++-- ubuntu/colcon_test/action.yml | 4 ++-- ubuntu/install_colcon/action.yml | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/macos/install_colcon/action.yml b/macos/install_colcon/action.yml index cac0c5d7..d85db658 100644 --- a/macos/install_colcon/action.yml +++ b/macos/install_colcon/action.yml @@ -6,7 +6,7 @@ runs: steps: - name: Install colcon - uses: eProsima/eProsima-CI/macos/install_python_packages@feature/fastdds_mac_ci_support + uses: eProsima/eProsima-CI/macos/install_python_packages@main with: packages: 'setuptools==58.3.0 colcon-common-extensions colcon-mixin' upgrade: false diff --git a/multiplatform/colcon_build/action.yml b/multiplatform/colcon_build/action.yml index c74e2ec7..c38d8a5d 100644 --- a/multiplatform/colcon_build/action.yml +++ b/multiplatform/colcon_build/action.yml @@ -48,7 +48,7 @@ runs: steps: - name: Run in ubuntu or macOS - uses: eProsima/eProsima-CI/ubuntu/colcon_build@feature/fastdds_mac_ci_support + uses: eProsima/eProsima-CI/ubuntu/colcon_build@main if: runner.os == 'Linux' || runner.os == 'macOS' with: colcon_meta_file: ${{ inputs.colcon_meta_file }} @@ -61,7 +61,7 @@ runs: cmake_build_type: ${{ inputs.cmake_build_type }} - name: Run in windows - uses: eProsima/eProsima-CI/windows/colcon_build@feature/fastdds_mac_ci_support + uses: eProsima/eProsima-CI/windows/colcon_build@main if: runner.os == 'Windows' with: colcon_meta_file: ${{ inputs.colcon_meta_file }} diff --git a/multiplatform/colcon_test/action.yml b/multiplatform/colcon_test/action.yml index eab81650..568c2887 100644 --- a/multiplatform/colcon_test/action.yml +++ b/multiplatform/colcon_test/action.yml @@ -55,7 +55,7 @@ runs: - name: Run in ubuntu or macOS id: test_ubuntu_mac - uses: eProsima/eProsima-CI/ubuntu/colcon_test@feature/fastdds_mac_ci_support + uses: eProsima/eProsima-CI/ubuntu/colcon_test@main if: runner.os == 'Linux' || runner.os == 'macOS' with: colcon_test_args: ${{ inputs.colcon_test_args }} @@ -69,7 +69,7 @@ runs: - name: Run in windows id: test_windows - uses: eProsima/eProsima-CI/windows/colcon_test@feature/fastdds_mac_ci_support + uses: eProsima/eProsima-CI/windows/colcon_test@main if: runner.os == 'Windows' with: colcon_test_args: ${{ inputs.colcon_test_args }} diff --git a/multiplatform/install_colcon/action.yml b/multiplatform/install_colcon/action.yml index 40feb96e..0b9d2ebf 100644 --- a/multiplatform/install_colcon/action.yml +++ b/multiplatform/install_colcon/action.yml @@ -6,13 +6,13 @@ runs: steps: - name: Run in ubuntu - uses: eProsima/eProsima-CI/ubuntu/install_colcon@feature/fastdds_mac_ci_support + uses: eProsima/eProsima-CI/ubuntu/install_colcon@main if: runner.os == 'Linux' - name: Run in macOS - uses: eProsima/eProsima-CI/macos/install_colcon@feature/fastdds_mac_ci_support + uses: eProsima/eProsima-CI/macos/install_colcon@main if: runner.os == 'macOS' - name: Run in windows - uses: eProsima/eProsima-CI/windows/install_colcon@feature/fastdds_mac_ci_support + uses: eProsima/eProsima-CI/windows/install_colcon@main if: runner.os == 'Windows' diff --git a/multiplatform/install_gtest/action.yml b/multiplatform/install_gtest/action.yml index 416a0e2c..a04ce86f 100644 --- a/multiplatform/install_gtest/action.yml +++ b/multiplatform/install_gtest/action.yml @@ -18,14 +18,14 @@ runs: steps: - name: Run in ubuntu or macOS - uses: eProsima/eProsima-CI/ubuntu/install_gtest@feature/fastdds_mac_ci_support + uses: eProsima/eProsima-CI/ubuntu/install_gtest@main if: runner.os == 'Linux' || runner.os == 'macOS' with: cmake_build_type: ${{ inputs.cmake_build_type }} version: ${{ inputs.version }} - name: Run in windows - uses: eProsima/eProsima-CI/windows/install_gtest@feature/fastdds_mac_ci_support + uses: eProsima/eProsima-CI/windows/install_gtest@main if: runner.os == 'Windows' with: cmake_build_type: ${{ inputs.cmake_build_type }} diff --git a/multiplatform/install_python_packages/action.yml b/multiplatform/install_python_packages/action.yml index 2d0ff306..7a0896e8 100644 --- a/multiplatform/install_python_packages/action.yml +++ b/multiplatform/install_python_packages/action.yml @@ -23,7 +23,7 @@ runs: steps: - name: Run in ubuntu - uses: eProsima/eProsima-CI/ubuntu/install_python_packages@feature/fastdds_mac_ci_support + uses: eProsima/eProsima-CI/ubuntu/install_python_packages@main if: runner.os == 'Linux' with: packages: ${{ inputs.packages }} @@ -31,7 +31,7 @@ runs: requirements_file_name: ${{ inputs.requirements_file_name }} - name: Run in macOS - uses: eProsima/eProsima-CI/macos/install_python_packages@feature/fastdds_mac_ci_support + uses: eProsima/eProsima-CI/macos/install_python_packages@main if: runner.os == 'macOS' with: packages: ${{ inputs.packages }} @@ -39,7 +39,7 @@ runs: requirements_file_name: ${{ inputs.requirements_file_name }} - name: Run in windows - uses: eProsima/eProsima-CI/windows/install_python_packages@feature/fastdds_mac_ci_support + uses: eProsima/eProsima-CI/windows/install_python_packages@main if: runner.os == 'Windows' with: packages: ${{ inputs.packages }} diff --git a/multiplatform/junit_summary/action.yaml b/multiplatform/junit_summary/action.yaml index 72be0c58..da15977c 100644 --- a/multiplatform/junit_summary/action.yaml +++ b/multiplatform/junit_summary/action.yaml @@ -32,7 +32,7 @@ runs: - name: Run in ubuntu or macOS if: runner.os == 'Linux' || runner.os == 'macOS' - uses: eProsima/eProsima-CI/ubuntu/junit_summary@feature/fastdds_mac_ci_support + uses: eProsima/eProsima-CI/ubuntu/junit_summary@main with: junit_reports_dir: ${{ inputs.junit_reports_dir }} print_summary: ${{ inputs.print_summary }} @@ -42,7 +42,7 @@ runs: - name: Run in windows if: runner.os == 'Windows' - uses: eProsima/eProsima-CI/windows/junit_summary@feature/fastdds_mac_ci_support + uses: eProsima/eProsima-CI/windows/junit_summary@main with: junit_reports_dir: ${{ inputs.junit_reports_dir }} print_summary: ${{ inputs.print_summary }} diff --git a/ubuntu/colcon_test/action.yml b/ubuntu/colcon_test/action.yml index 26629673..a16b35df 100644 --- a/ubuntu/colcon_test/action.yml +++ b/ubuntu/colcon_test/action.yml @@ -54,7 +54,7 @@ runs: steps: - name: Install lxml - uses: eProsima/eProsima-CI/ubuntu/install_python_packages@feature/fastdds_mac_ci_support + uses: eProsima/eProsima-CI/ubuntu/install_python_packages@main with: packages: lxml @@ -118,7 +118,7 @@ runs: shell: bash - name: Upload test report in JUnit format - uses: eProsima/eProsima-CI/external/upload-artifact@feature/fastdds_mac_ci_support + uses: eProsima/eProsima-CI/external/upload-artifact@main if: ${{ ! cancelled() }} with: name: ${{ inputs.test_report_artifact || format('test_report_{0}_{1}', github.job, join(matrix.*, '_')) }} diff --git a/ubuntu/install_colcon/action.yml b/ubuntu/install_colcon/action.yml index afcfbe74..be008d0a 100644 --- a/ubuntu/install_colcon/action.yml +++ b/ubuntu/install_colcon/action.yml @@ -6,7 +6,7 @@ runs: steps: - name: Install colcon - uses: eProsima/eProsima-CI/ubuntu/install_python_packages@feature/fastdds_mac_ci_support + uses: eProsima/eProsima-CI/ubuntu/install_python_packages@main with: packages: 'setuptools==58.3.0 colcon-common-extensions colcon-mixin' upgrade: true