From 2991b073ad3b669a5dc9c02e26fb2811c5b108ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Fri, 20 Oct 2023 11:30:11 +0200 Subject: [PATCH] Refs #19657. Using eprosima-ci MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- .github/workflows/build_and_test.yml | 53 ++++++++-------------------- fastdds_python.repos | 1 - 2 files changed, 14 insertions(+), 40 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 52de0278..e51b3b6f 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -19,23 +19,7 @@ jobs: steps: - - name: install OpenSSL - shell: pwsh - run: | - choco install openssl -yr --no-progress - "System32;SysWoW64" -split ";" | Join-Path -Path $env:windir -ChildPath {$_} ` - | ls -Include libssl-*.dll | rm - - - name: Install ninja - if: github.event.schedule == '' - shell: pwsh - run: choco install ninja - - - name: Setting ninja - id: ninja - if: github.event.schedule == '' - shell: pwsh - run: echo "cmake_generator=ninja" >> $Env:GITHUB_OUTPUT + - uses: eProsima/eProsima-CI/windows/install_openssl@v0 - name: Install swig shell: pwsh @@ -66,7 +50,7 @@ jobs: } & $python_exec -m pip install -U pytest pywin32 - - uses: actions/checkout@v4 + - uses: eProsima/eProsima-CI/external/checkout@v0 with: path: src/fastdds_python @@ -75,28 +59,20 @@ jobs: run: | vcs import src --skip-existing --input src/fastdds_python/fastdds_python.repos - - name: Get minimum supported version of CMake - uses: lukka/get-cmake@latest + - uses: eProsima/eProsima-CI/external/get-cmake@feature/ccache with: cmakeVersion: 3.22.6 - - name: Use cmake - run: cmake --version - - - name: Install ccache + - name: Setting ninja + id: ninja + if: github.event.schedule == '' shell: pwsh run: | - pwsh -File "src\fastdds_python\.github\ci\ccache.ps1" - $ccache_dir = $pwd.PATH - $ccache_dir = "$ccache_dir\.github\ccache" - echo "$ccache_dir" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - Set-Item -Force -Path "env:PATH" -Value "$ccache_dir;$env:PATH" - ccache --version + echo "cmake_generator=ninja" >> $Env:GITHUB_OUTPUT - name: Setup ccache - uses: Chocobo1/setup-ccache-action@v1 + uses: eProsima/eProsima-CI/external/setup-ccache-action@feature/ccache with: - prepend_symlinks_to_path: false install_ccache: false windows_compile_environment: msvc @@ -108,6 +84,7 @@ jobs: Import-Module $modulepath Enter-VsDevShell -SetDefaultWindowTitle -InstallPath $installpath ` -StartInPath (pwd) -DevCmdArguments '/arch=x64 /host_arch=x64'; + cmake --version colcon build --executor parallel --event-handlers console_direct+ desktop_notification- ` --metas ./src/fastdds_python/.github/workflows/test.meta ` --mixin rel-with-deb-info ccache ${{ steps.ninja.outputs.cmake_generator }} @@ -129,7 +106,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v4 + - uses: eProsima/eProsima-CI/external/checkout@v0 with: path: src/fastdds_python @@ -154,18 +131,16 @@ jobs: run: | vcs import --skip-existing src < src/fastdds_python/fastdds_python.repos - - name: Get minimum supported version of CMake - uses: lukka/get-cmake@latest + - uses: eProsima/eProsima-CI/external/get-cmake@feature/ccache with: cmakeVersion: 3.22.6 - - name: Use cmake - run: cmake --version - name: Setup ccache - uses: Chocobo1/setup-ccache-action@v1 + uses: eProsima/eProsima-CI/external/setup-ccache-action@feature/ccache - name: Build workspace - run: > + run: | + cmake --version colcon build \ --event-handlers=console_direct+ \ --metas ./src/fastdds_python/.github/workflows/test.meta \ diff --git a/fastdds_python.repos b/fastdds_python.repos index 0e1d3ad9..3c54fb58 100644 --- a/fastdds_python.repos +++ b/fastdds_python.repos @@ -23,4 +23,3 @@ repositories: type: git url: https://github.com/eProsima/IDL-Parser.git version: master -