From 46fb45913150a34ae4f74d509b3c87b010ce9514 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Thu, 23 Jan 2025 16:57:14 +0100 Subject: [PATCH] Fix CI Signed-off-by: Eugenio Collado --- .../actions/install_mcap_dependencies/action.yml | 2 +- .github/actions/project_dependencies/action.yml | 16 ++++++++-------- .github/workflows/reusable-windows-ci.yml | 2 +- .github/workflows/reusable-workflow.yml | 10 +++++----- .github/workflows/test.yml | 16 ++++++++-------- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/actions/install_mcap_dependencies/action.yml b/.github/actions/install_mcap_dependencies/action.yml index 96790c79b..47f714091 100644 --- a/.github/actions/install_mcap_dependencies/action.yml +++ b/.github/actions/install_mcap_dependencies/action.yml @@ -32,7 +32,7 @@ runs: uses: lukka/run-vcpkg@v11 with: vcpkgDirectory: '${{ github.workspace }}/vcpkg' - vcpkgGitCommitId: 'a42af01b72c28a8e1d7b48107b33e4f286a55ef6' + vcpkgGitCommitId: '6f29f12e82a8293156836ad81cc9bf5af41fe836' - name: Install lz4 and zstd if: runner.os == 'Windows' diff --git a/.github/actions/project_dependencies/action.yml b/.github/actions/project_dependencies/action.yml index cba5dc648..82f195055 100644 --- a/.github/actions/project_dependencies/action.yml +++ b/.github/actions/project_dependencies/action.yml @@ -40,15 +40,15 @@ runs: using: composite steps: - - name: Install Fast DDS dependencies - uses: eProsima/eProsima-CI/multiplatform/install_fastdds_dependencies@v0 - with: - cmake_build_type: ${{ inputs.cmake_build_type }} + # - name: Install Fast DDS dependencies + # uses: eProsima/eProsima-CI/multiplatform/install_fastdds_dependencies@v0 + # with: + # cmake_build_type: ${{ inputs.cmake_build_type }} - - name: Install yaml cpp dependency - uses: eProsima/eProsima-CI/multiplatform/install_yamlcpp@v0 - with: - cmake_build_type: ${{ inputs.cmake_build_type }} + # - name: Install yaml cpp dependency + # uses: eProsima/eProsima-CI/multiplatform/install_yamlcpp@v0 + # with: + # cmake_build_type: ${{ inputs.cmake_build_type }} - name: Download and install mcap dependencies uses: ./src/.github/actions/install_mcap_dependencies diff --git a/.github/workflows/reusable-windows-ci.yml b/.github/workflows/reusable-windows-ci.yml index 1364b7c5a..dbf65c01b 100644 --- a/.github/workflows/reusable-windows-ci.yml +++ b/.github/workflows/reusable-windows-ci.yml @@ -52,7 +52,7 @@ jobs: matrix: os: - windows-2019 - - windows-2022 + #- windows-2022 uses: ./.github/workflows/reusable-workflow.yml with: os: ${{ matrix.os }} diff --git a/.github/workflows/reusable-workflow.yml b/.github/workflows/reusable-workflow.yml index a983b801b..c877ecd8f 100644 --- a/.github/workflows/reusable-workflow.yml +++ b/.github/workflows/reusable-workflow.yml @@ -60,11 +60,11 @@ jobs: - Debug steps: - - name: Sync repository - uses: eProsima/eProsima-CI/external/checkout@v0 - with: - path: src - ref: ${{ inputs.ref }} + # - name: Sync repository + # uses: eProsima/eProsima-CI/external/checkout@v0 + # with: + # path: src + # ref: ${{ inputs.ref }} - name: Download dependencies and install requirements uses: ./src/.github/actions/project_dependencies diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9477441df..d363e6eae 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,14 +29,14 @@ on: jobs: - reusable_tests_ubuntu: - name: ubuntu-ci - uses: ./.github/workflows/reusable-ubuntu-ci.yml - with: - custom_version_build: ${{ inputs.custom_version_build || 'v3' }} - dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix || '_nightly' }} - ref: ${{ github.ref }} - secrets: inherit + # reusable_tests_ubuntu: + # name: ubuntu-ci + # uses: ./.github/workflows/reusable-ubuntu-ci.yml + # with: + # custom_version_build: ${{ inputs.custom_version_build || 'v3' }} + # dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix || '_nightly' }} + # ref: ${{ github.ref }} + # secrets: inherit reusable_tests_windows: name: windows-ci