Skip to content

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history
Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
  • Loading branch information
EugenioCollado committed Jan 23, 2025
1 parent b933de7 commit 46fb459
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/actions/install_mcap_dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
16 changes: 8 additions & 8 deletions .github/actions/project_dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
matrix:
os:
- windows-2019
- windows-2022
#- windows-2022
uses: ./.github/workflows/reusable-workflow.yml
with:
os: ${{ matrix.os }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/reusable-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 46fb459

Please sign in to comment.