From 1715884fbe8240678dc4a8a72fb25c06cca9f7ed Mon Sep 17 00:00:00 2001 From: Irene Bandera Date: Thu, 30 Nov 2023 09:43:18 +0100 Subject: [PATCH 1/2] Install correct empy version before installing colcon Signed-off-by: Irene Bandera --- .github/actions/install-python-packages/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/install-python-packages/action.yml b/.github/actions/install-python-packages/action.yml index fb600b95..17d374f0 100644 --- a/.github/actions/install-python-packages/action.yml +++ b/.github/actions/install-python-packages/action.yml @@ -7,6 +7,7 @@ runs: run: | sudo pip3 install -U \ black==22.3.0 \ + empy==3.3.4 \ colcon-common-extensions \ colcon-mixin \ doc8==0.8.0 \ From 7b22b4e33db9d59933c7c8fdacfee81f47efe0e0 Mon Sep 17 00:00:00 2001 From: Irene Bandera Date: Thu, 30 Nov 2023 11:00:16 +0100 Subject: [PATCH 2/2] Install python packages and colcon using eProsima-CI Signed-off-by: Irene Bandera --- .../install-python-packages/action.yml | 28 ---- .github/workflows/test.yml | 155 +++++++++++++++++- 2 files changed, 148 insertions(+), 35 deletions(-) delete mode 100644 .github/actions/install-python-packages/action.yml diff --git a/.github/actions/install-python-packages/action.yml b/.github/actions/install-python-packages/action.yml deleted file mode 100644 index 17d374f0..00000000 --- a/.github/actions/install-python-packages/action.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: 'install-python-packages' -description: 'Install necessary python packages' -runs: - using: "composite" - steps: - - id: install-python-packages - run: | - sudo pip3 install -U \ - black==22.3.0 \ - empy==3.3.4 \ - colcon-common-extensions \ - colcon-mixin \ - doc8==0.8.0 \ - GitPython \ - setuptools \ - gcovr==5.0 \ - sphinx_rtd_theme==0.4.3 \ - sphinx==3.0.3 \ - sphinx-tabs==3.2.0 \ - sphinxcontrib-imagehelper==1.1.1 \ - sphinxcontrib.spelling==5.0.0 \ - vcstool \ - flake8==5.0.4 \ - flake8-quotes \ - pytest \ - pytest-timeout - - shell: bash diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index baebb8f1..b1f56090 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -100,8 +100,29 @@ jobs: - name: Install GTest uses: ./src/AML-IP/.github/actions/install-gtest-linux + - name: Install colcon + uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0 + - name: Install Python packages - uses: ./src/AML-IP/.github/actions/install-python-packages + uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0 + with: + packages: \ + black==22.3.0 \ + doc8==0.8.0 \ + GitPython \ + setuptools \ + gcovr==5.0 \ + sphinx_rtd_theme==0.4.3 \ + sphinx==3.0.3 \ + sphinx-tabs==3.2.0 \ + sphinxcontrib-imagehelper==1.1.1 \ + sphinxcontrib.spelling==5.0.0 \ + vcstool \ + flake8==5.0.4 \ + flake8-quotes \ + pytest \ + pytest-timeout + - name: Get build eProsima dependencies Job Id run: | @@ -208,8 +229,28 @@ jobs: - name: Install apt packages uses: ./src/AML-IP/.github/actions/install-apt-packages + - name: Install colcon + uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0 + - name: Install Python packages - uses: ./src/AML-IP/.github/actions/install-python-packages + uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0 + with: + packages: \ + black==22.3.0 \ + doc8==0.8.0 \ + GitPython \ + setuptools \ + gcovr==5.0 \ + sphinx_rtd_theme==0.4.3 \ + sphinx==3.0.3 \ + sphinx-tabs==3.2.0 \ + sphinxcontrib-imagehelper==1.1.1 \ + sphinxcontrib.spelling==5.0.0 \ + vcstool \ + flake8==5.0.4 \ + flake8-quotes \ + pytest \ + pytest-timeout - name: Get build eProsima dependencies Job Id run: | @@ -284,8 +325,28 @@ jobs: - name: Install GTest uses: ./src/AML-IP/.github/actions/install-gtest-linux + - name: Install colcon + uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0 + - name: Install Python packages - uses: ./src/AML-IP/.github/actions/install-python-packages + uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0 + with: + packages: \ + black==22.3.0 \ + doc8==0.8.0 \ + GitPython \ + setuptools \ + gcovr==5.0 \ + sphinx_rtd_theme==0.4.3 \ + sphinx==3.0.3 \ + sphinx-tabs==3.2.0 \ + sphinxcontrib-imagehelper==1.1.1 \ + sphinxcontrib.spelling==5.0.0 \ + vcstool \ + flake8==5.0.4 \ + flake8-quotes \ + pytest \ + pytest-timeout - name: Get build eProsima dependencies Job Id run: | @@ -345,8 +406,28 @@ jobs: - name: Install GTest uses: ./src/AML-IP/.github/actions/install-gtest-linux + - name: Install colcon + uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0 + - name: Install Python packages - uses: ./src/AML-IP/.github/actions/install-python-packages + uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0 + with: + packages: \ + black==22.3.0 \ + doc8==0.8.0 \ + GitPython \ + setuptools \ + gcovr==5.0 \ + sphinx_rtd_theme==0.4.3 \ + sphinx==3.0.3 \ + sphinx-tabs==3.2.0 \ + sphinxcontrib-imagehelper==1.1.1 \ + sphinxcontrib.spelling==5.0.0 \ + vcstool \ + flake8==5.0.4 \ + flake8-quotes \ + pytest \ + pytest-timeout - name: Get build eProsima dependencies Job Id run: | @@ -411,8 +492,28 @@ jobs: - name: Install GTest uses: ./src/AML-IP/.github/actions/install-gtest-linux + - name: Install colcon + uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0 + - name: Install Python packages - uses: ./src/AML-IP/.github/actions/install-python-packages + uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0 + with: + packages: \ + black==22.3.0 \ + doc8==0.8.0 \ + GitPython \ + setuptools \ + gcovr==5.0 \ + sphinx_rtd_theme==0.4.3 \ + sphinx==3.0.3 \ + sphinx-tabs==3.2.0 \ + sphinxcontrib-imagehelper==1.1.1 \ + sphinxcontrib.spelling==5.0.0 \ + vcstool \ + flake8==5.0.4 \ + flake8-quotes \ + pytest \ + pytest-timeout - name: Get build eProsima dependencies Job Id run: | @@ -466,8 +567,28 @@ jobs: - name: Install apt packages uses: ./src/AML-IP/.github/actions/install-apt-packages + - name: Install colcon + uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0 + - name: Install Python packages - uses: ./src/AML-IP/.github/actions/install-python-packages + uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0 + with: + packages: \ + black==22.3.0 \ + doc8==0.8.0 \ + GitPython \ + setuptools \ + gcovr==5.0 \ + sphinx_rtd_theme==0.4.3 \ + sphinx==3.0.3 \ + sphinx-tabs==3.2.0 \ + sphinxcontrib-imagehelper==1.1.1 \ + sphinxcontrib.spelling==5.0.0 \ + vcstool \ + flake8==5.0.4 \ + flake8-quotes \ + pytest \ + pytest-timeout - name: Install uncrustify run: | @@ -541,8 +662,28 @@ jobs: - name: Install apt packages uses: ./src/AML-IP/.github/actions/install-apt-packages + - name: Install colcon + uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0 + - name: Install Python packages - uses: ./src/AML-IP/.github/actions/install-python-packages + uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0 + with: + packages: \ + black==22.3.0 \ + doc8==0.8.0 \ + GitPython \ + setuptools \ + gcovr==5.0 \ + sphinx_rtd_theme==0.4.3 \ + sphinx==3.0.3 \ + sphinx-tabs==3.2.0 \ + sphinxcontrib-imagehelper==1.1.1 \ + sphinxcontrib.spelling==5.0.0 \ + vcstool \ + flake8==5.0.4 \ + flake8-quotes \ + pytest \ + pytest-timeout - name: Get difference run: |