Skip to content

Commit

Permalink
Backport workflows from master (#3967)
Browse files Browse the repository at this point in the history
* Refs #19048. Backport workflows from master.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #19048. Change discovery-server version.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Apply suggestion

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

* Refs #19048: Cleanup actions

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
  • Loading branch information
MiguelCompany and EduPonz authored Nov 30, 2023
1 parent 12bb5b3 commit d994233
Show file tree
Hide file tree
Showing 20 changed files with 334 additions and 318 deletions.
18 changes: 0 additions & 18 deletions .github/actions/install-python-packages/action.yml

This file was deleted.

File renamed without changes.
25 changes: 0 additions & 25 deletions .github/workflows/config/coverage.meta

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/config/coverage.repos
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ repositories:
fastcdr:
type: git
url: https://github.com/eProsima/Fast-CDR.git
version: master
version: 1.1.x
foonathan_memory_vendor:
type: git
url: https://github.com/eProsima/foonathan_memory_vendor.git
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ repositories:
fastcdr:
type: git
url: https://github.com/eProsima/Fast-CDR.git
version: master
version: 1.0.x
foonathan_memory_vendor:
type: git
url: https://github.com/eProsima/foonathan_memory_vendor.git
version: master
version: v1.3.0
googletest-distribution:
type: git
url: https://github.com/google/googletest.git
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ repositories:
fastcdr:
type: git
url: https://github.com/eProsima/Fast-CDR.git
version: master
version: 1.1.x
foonathan_memory_vendor:
type: git
url: https://github.com/eProsima/foonathan_memory_vendor.git
version: master
version: v1.3.1
googletest-distribution:
type: git
url: https://github.com/google/googletest.git
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/config/default_ci_2.6.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: 1.0.x
foonathan_memory_vendor:
type: git
url: https://github.com/eProsima/foonathan_memory_vendor.git
version: v1.2.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.10.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: 1.0.x
foonathan_memory_vendor:
type: git
url: https://github.com/eProsima/foonathan_memory_vendor.git
version: v1.3.0
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.11.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: 1.1.x
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.6.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: 1.0.x
foonathan_memory_vendor:
type: git
url: https://github.com/eProsima/foonathan_memory_vendor.git
version: v1.2.1
googletest-distribution:
type: git
url: https://github.com/google/googletest.git
version: release-1.11.0
31 changes: 31 additions & 0 deletions .github/workflows/config/tsan_colcon.meta
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"names":
{
"fastcdr":
{
"cmake-args":
[
"-DCMAKE_C_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'",
"-DCMAKE_CXX_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
]
},
"fastrtps":
{
"cmake-args":
[
"-DCOMPILE_EXAMPLES=OFF",
"-DEPROSIMA_BUILD_TESTS=ON",
"-DGTEST_INDIVIDUAL=ON",
"-DRTPS_API_TESTS=ON",
"-DFASTRTPS_API_TESTS=OFF",
"-DFASTDDS_PIM_API_TESTS=ON",
"-DPERFORMANCE_TESTS=ON",
"-DSECURITY=ON",
"-DFASTDDS_STATISTICS=ON",
"-DCMAKE_C_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'",
"-DCMAKE_CXX_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
]
}

}
}
13 changes: 9 additions & 4 deletions .github/workflows/documentation-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ on:

push:
branches:
- 'master'
- '2.11.x'
paths-ignore:
- '**.md'
- '**.txt'
- '!**/CMakeLists.txt'

pull_request:
branches:
- 'master'
- '2.11.x'
paths-ignore:
- '**.md'
- '**.txt'
Expand Down 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
4 changes: 2 additions & 2 deletions .github/workflows/mirror.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
fail-fast: false
matrix:
dest_branch:
- '2.11.x'
- '2.12.x'
steps:
- name: Mirror action step
id: mirror
uses: google/mirror-branch-action@v1.0
uses: eProsima/eProsima-CI/external/mirror-branch-action@v0
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
source: 'master'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/nightly-windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ jobs:
label: 'nightly-sec-windows-ci'
cmake-args: "-DSECURITY=ON"
ctest-args: "-LE xfail"
fastdds_branch: '2.11.x'

nightly-nosec-windows-ci:
uses: ./.github/workflows/reusable-windows-ci.yml
with:
label: 'nightly-nosec-windows-ci'
cmake-args: "-DSECURITY=OFF"
ctest-args: "-LE xfail"
fastdds_branch: '2.11.x'
58 changes: 46 additions & 12 deletions .github/workflows/reusable-windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ on:
description: 'Extra arguments for ctest cli'
required: false
type: string
fastdds_branch:
description: 'Branch or tag of Fast DDS repository (https://github.com/eProsima/Fast-DDS)'
required: true
type: string

defaults:
run:
Expand Down Expand Up @@ -135,10 +139,40 @@ jobs:
# WER service is manual by default
Start-Service WerSvc
- name: Install colcon and other python packages
- name: Install OpenSSL
uses: eProsima/eprosima-CI/windows/install_openssl@v0

- name: Update OpenSSL environment variables
run: |
pip3 install -U colcon-common-extensions vcstool colcon-mixin xmlschema
# Update the environment
if (Test-Path -Path $Env:ProgramW6432\OpenSSL)
{
"OPENSSL64_ROOT=$Env:ProgramW6432\OpenSSL" | Out-File $Env:GITHUB_ENV -Append -Encoding OEM
}
elseif (Test-Path -Path $Env:ProgramW6432\OpenSSL-Win)
{
"OPENSSL64_ROOT=$Env:ProgramW6432\OpenSSL-Win" | Out-File $Env:GITHUB_ENV -Append -Encoding OEM
}
elseif (Test-Path -Path $Env:ProgramW6432\OpenSSL-Win64)
{
"OPENSSL64_ROOT=$Env:ProgramW6432\OpenSSL-Win64" | Out-File $Env:GITHUB_ENV -Append -Encoding OEM
}
else
{
Write-Error -Message "Cannot find OpenSSL installation."
exit 1
}
- 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 @@ -200,14 +234,6 @@ jobs:
# clean up
'build', 'googletest', 'gtest.log' | del -Recurse -Force
- name: Install OpenSSL
uses: eProsima/eprosima-CI/windows/install_openssl@v0

- name: Update OpenSSL environment variables
run: |
# Update the environment
"OPENSSL64_ROOT=$Env:ProgramW6432\OpenSSL" | Out-File $Env:GITHUB_ENV -Append -Encoding OEM
- name: Update known hosts file for DNS resolver testing
if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') }}
run: |
Expand Down Expand Up @@ -348,13 +374,21 @@ jobs:
# Nightly job
if ("${{ inputs.label }}".Contains("nightly"))
{
$depends_repos_path = ".\src\fastrtps\.github\workflows\config\nightly.repos"
$depends_repos_path = ".\src\fastrtps\.github\workflows\config\nightly_${{ inputs.fastdds_branch }}.repos"
if (!(Test-Path -Path $depends_repos_path))
{
$depends_repos_path = ".\src\fastrtps\.github\workflows\config\nightly_master.repos"
}
$meta_path = ".\src\fastrtps\.github\workflows\config\nightly.meta"
}
# Either PR or manual
else
{
$depends_repos_path = ".\src\fastrtps\.github\workflows\config\default_ci.repos"
$depends_repos_path = ".\src\fastrtps\.github\workflows\config\default_ci_${{ inputs.fastdds_branch }}.repos"
if (!(Test-Path -Path $depends_repos_path))
{
$depends_repos_path = ".\src\fastrtps\.github\workflows\config\default_ci_master.repos"
}
$meta_path = ".\src\fastrtps\.github\workflows\config\default_ci.meta"
}
Write-Output "Selected repos files: $depends_repos_path"
Expand Down
Loading

0 comments on commit d994233

Please sign in to comment.