Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20055] Fix colcon on github CI (backport #4075) #4077

Merged
merged 1 commit into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions .github/actions/install-python-packages/action.yml

This file was deleted.

13 changes: 13 additions & 0 deletions .github/workflows/config/default_ci_2.12.x.repos
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
repositories:
fastcdr:
type: git
url: https://github.com/eProsima/Fast-CDR.git
version: v2.1.0
foonathan_memory_vendor:
type: git
url: https://github.com/eProsima/foonathan_memory_vendor.git
version: v1.3.1
googletest-distribution:
type: git
url: https://github.com/google/googletest.git
version: release-1.11.0
13 changes: 13 additions & 0 deletions .github/workflows/config/nightly_2.12.x.repos
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
repositories:
fastcdr:
type: git
url: https://github.com/eProsima/Fast-CDR.git
version: v2.1.0
foonathan_memory_vendor:
type: git
url: https://github.com/eProsima/foonathan_memory_vendor.git
version: v1.3.1
googletest-distribution:
type: git
url: https://github.com/google/googletest.git
version: release-1.11.0
9 changes: 7 additions & 2 deletions .github/workflows/documentation-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,14 @@ jobs:
path: src/fastdds-docs
ref: ${{ env.ACTION_BRANCH_NAME }}

- name: Install colcon
uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0

- name: Install required python packages
run: |
pip3 install -r src/fastdds-docs/docs/requirements.txt
uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0
with:
upgrade: false
requirements_file_name: src/fastdds-docs/docs/requirements.txt

- name: Build documentation
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-windows-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Fast-DDS Windows CI
name: Fast-DDS Windows CI (nightly)

on:
workflow_dispatch:
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/reusable-windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,16 @@ jobs:
exit 1
}

- name: Install colcon and other python packages
run: |
pip3 install -U colcon-common-extensions vcstool colcon-mixin xmlschema
- name: Install colcon
uses: eProsima/eProsima-CI/windows/install_colcon@v0

- name: Install Python dependencies
uses: eProsima/eProsima-CI/windows/install_python_packages@v0
with:
packages: vcstool xmlschema

- name: Patch colcon for issue with VS2022
run: |
# patch colcon issue with visual studio 2022
$patch = gci -Include build.py -Recurse `
-Path ((gcm colcon).source | Split-Path | Join-Path -ChildPath "..\Lib\site-packages\colcon_cmake\*")
Expand Down Expand Up @@ -434,6 +440,7 @@ jobs:

- name: Build
id: build
continue-on-error: false
run: |
# build type mixin names doesn't match cmake ones
$translate = @{
Expand Down
34 changes: 20 additions & 14 deletions .github/workflows/sanitizer-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,21 @@ jobs:
FASTDDS_BRANCH: ${{ github.head_ref || github.event.inputs.fastdds_branch || 'master' }}

steps:
- uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
- name: Install wget
uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
with:
packages: wget

- uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0
- name: Install colcon
uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0

- name: Install Python dependencies
uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0
with:
packages: vcstool
packages: vcstool setuptools gcovr tomark xmltodict jsondiff pandas

- uses: eProsima/eProsima-CI/ubuntu/get_file_from_repo@v0
- name: Get fastrtps.repos file
uses: eProsima/eProsima-CI/ubuntu/get_file_from_repo@v0
with:
source_repository: eProsima/Fast-DDS
source_repository_branch: ${{ env.FASTDDS_BRANCH }}
Expand All @@ -60,9 +66,6 @@ jobs:
- name: Install apt packages
uses: ./src/fastrtps/.github/actions/install-apt-packages

- name: Install Python packages
uses: ./src/fastrtps/.github/actions/install-python-packages

- name: Install GTest
uses: eProsima/eProsima-CI/ubuntu/install_gtest@v0
with:
Expand Down Expand Up @@ -113,15 +116,21 @@ jobs:
DEFAULT_DISCOVERY_SERVER_BRANCH: ${{ github.event.inputs.discovery_server_branch || 'master' }}

steps:
- uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
- name: Install wget
uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
with:
packages: wget

- uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0
- name: Install colcon
uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0

- name: Install Python dependencies
uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0
with:
packages: vcstool
packages: vcstool setuptools gcovr tomark xmltodict jsondiff pandas

- uses: eProsima/eProsima-CI/ubuntu/get_file_from_repo@v0
- name: Get fastrtps.repos file
uses: eProsima/eProsima-CI/ubuntu/get_file_from_repo@v0
with:
source_repository: eProsima/Fast-DDS
source_repository_branch: ${{ env.FASTDDS_BRANCH }}
Expand Down Expand Up @@ -149,9 +158,6 @@ jobs:
- name: Install apt packages
uses: ./src/fastrtps/.github/actions/install-apt-packages

- name: Install Python packages
uses: ./src/fastrtps/.github/actions/install-python-packages

- name: Install GTest
uses: eProsima/eProsima-CI/ubuntu/install_gtest@v0
with:
Expand Down
17 changes: 10 additions & 7 deletions .github/workflows/thread-sanitizer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,21 @@ jobs:
CXX: g++-12

steps:
- uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
- name: Install wget
uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
with:
packages: wget

- uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0
- name: Install colcon
uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0

- name: Install Python dependencies
uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0
with:
packages: vcstool
packages: vcstool setuptools gcovr tomark xmltodict jsondiff pandas

- uses: eProsima/eProsima-CI/ubuntu/get_file_from_repo@v0
- name: Get fastrtps.repos file
uses: eProsima/eProsima-CI/ubuntu/get_file_from_repo@v0
with:
source_repository: eProsima/Fast-DDS
source_repository_branch: ${{ env.FASTDDS_BRANCH }}
Expand All @@ -83,9 +89,6 @@ jobs:
- name: Install apt packages
uses: ./src/fastrtps/.github/actions/install-apt-packages

- name: Install Python packages
uses: ./src/fastrtps/.github/actions/install-python-packages

- name: Install GTest
uses: eProsima/eProsima-CI/ubuntu/install_gtest@v0
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ on:
push:
branches:
- 'master'
- '2.12.x'
- '2.11.x'
- '2.10.x'
- '2.6.x'
Expand Down
Loading