(CI) Set branch of missing dependencies in build-dependencies workflow (

#65) * Set branch of missing dependencies in build-dependencies workflow Signed-off-by: Raul Sanchez-Mateos <[email protected]> * Fix Fast DDS version to 2.11.x Signed-off-by: Raul Sanchez-Mateos <[email protected]> --------- Signed-off-by: Raul Sanchez-Mateos <[email protected]>
eProsima · Oct 9, 2023 · 36af952 · 36af952
1 parent 41d97c6
commit 36af952
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 10 deletions.
diff --git a/.github/actions/install-eprosima-dependencies-windows/action.yml b/.github/actions/install-eprosima-dependencies-windows/action.yml
@@ -5,6 +5,14 @@ inputs:
     description: 'Specifies the build type on single-configuration generators'
     required: true
     default: 'Release'
+  foonathan_memory_vendor_branch:
+    description: 'Branch or tag of eProsima/foonathan_memory_vendor repository (https://github.com/eProsima/foonathan_memory_vendor)'
+    required: true
+    default: 'master'
+  fastcdr_branch:
+    description: 'Branch or tag of eProsima/Fast-CDR repository (https://github.com/eProsima/Fast-CDR)'
+    required: true
+    default: 'master'
   fastdds_branch:
     description: 'Branch or tag of Fast DDS repository (https://github.com/eProsima/Fast-DDS)'
     required: true
@@ -28,7 +36,7 @@ runs:
     - name: Install Fast CDR
       shell: pwsh
       run: >
-        git clone https://github.com/eProsima/Fast-CDR.git --branch 1.1.x;
+        git clone https://github.com/eProsima/Fast-CDR.git --branch ${{ inputs.fastcdr_branch }};
         cmake -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}\eprosima\install `
           -DCMAKE_PREFIX_PATH=${{ github.workspace }}\eprosima\install `
           -Ax64 -T host=x64 -B build\fastcdr Fast-CDR;

diff --git a/.github/actions/install-fastcdr-windows/action.yml b/.github/actions/install-fastcdr-windows/action.yml
@@ -5,11 +5,15 @@ inputs:
     description: 'Specifies the build type on single-configuration generators'
     required: true
     default: 'Release'
+  fastcdr_branch:
+    description: 'Branch or tag of eProsima/Fast-CDR repository (https://github.com/eProsima/Fast-CDR)'
+    required: true
+    default: '1.1.x'
 runs:
   using: composite
   steps:
   - run: >
-      git clone https://github.com/eProsima/Fast-CDR.git --branch 1.1.x;
+      git clone https://github.com/eProsima/Fast-CDR.git --branch ${{ inputs.fastcdr_branch }};
       cmake -Ax64 -T host=x64 -B build\fastcdr Fast-CDR;
       cmake --build build\fastcdr --config ${{ inputs.cmake_build_type }} --target install
     shell: pwsh
diff --git a/.github/actions/install-fastdds-windows/action.yml b/.github/actions/install-fastdds-windows/action.yml
@@ -5,11 +5,15 @@ inputs:
     description: 'Specifies the build type on single-configuration generators'
     required: true
     default: 'Release'
+  fastdds_branch:
+    description: 'Branch or tag of eProsima/Fast-DDS repository (https://github.com/eProsima/Fast-DDS)'
+    required: true
+    default: '2.11.x'
 runs:
   using: composite
   steps:
   - run: >
-      git clone https://github.com/eProsima/Fast-DDS.git;
+      git clone https://github.com/eProsima/Fast-DDS.git --branch ${{ inputs.fastdds_branch }};
       cmake -DTHIRDPARTY=ON -DSECURITY=ON -DCOMPILE_EXAMPLES=OFF -DEPROSIMA_BUILD_TESTS=OFF `
         -DINTERNAL_DEBUG=ON -Ax64 -T host=x64 -B build\fastdds Fast-DDS;
       cmake --build build\fastdds --config ${{ inputs.cmake_build_type }} --target install

diff --git a/.github/workflows/build_dependencies.yml b/.github/workflows/build_dependencies.yml
@@ -6,12 +6,20 @@ name: build_dependencies
 on:
   workflow_dispatch:
     inputs:
-      fastdds_branch:
-        description: 'Branch or tag of Fast DDS repository (https://github.com/eProsima/Fast-DDS)'
+      foonathan_memory_vendor_branch:
+        description: 'Branch or tag of eProsima/foonathan_memory_vendor repository (https://github.com/eProsima/foonathan_memory_vendor)'
         required: true
         default: 'master'
+      fastcdr_branch:
+        description: 'Branch or tag of eProsima/Fast-CDR repository (https://github.com/eProsima/Fast-CDR)'
+        required: true
+        default: '1.1.x'
+      fastdds_branch:
+        description: 'Branch or tag of eProsima/Fast-DDS repository (https://github.com/eProsima/Fast-DDS)'
+        required: true
+        default: '2.11.x'
       utils_branch:
-        description: 'Branch or tag of Dev Utils repository (https://github.com/eProsima/dev-utils)'
+        description: 'Branch or tag of eProsima/dev-utils repository (https://github.com/eProsima/dev-utils)'
         required: true
         default: 'main'
   schedule:
@@ -46,10 +54,12 @@ jobs:
       - name: Install eProsima dependencies
         uses: ./DDS-Pipe/.github/actions/install-eprosima-dependencies-windows
         env:
-          DEFAULT_FASTDDS_BRANCH: 'master'
+          DEFAULT_FASTCDR_BRANCH: '1.1.x'
+          DEFAULT_FASTDDS_BRANCH: '2.11.x'
           DEFAULT_UTILS_BRANCH: 'main'
         with:
           cmake_build_type: ${{ matrix.cmake-config }}
+          fastcdr_branch: ${{ github.event.inputs.fastcdr_branch || env.DEFAULT_FASTCDR_BRANCH }}
           fastdds_branch: ${{ github.event.inputs.fastdds_branch || env.DEFAULT_FASTDDS_BRANCH }}
           utils_branch: ${{ github.event.inputs.utils_branch || env.DEFAULT_UTILS_BRANCH }}
 
@@ -87,7 +97,9 @@ jobs:
       - name: Fetch repositories
         run: |
           vcs import src <  src/DDS-Pipe/.github/workflows/ci.repos
-          cd src/fastrtps && git checkout ${{ inputs.fastdds_branch }} && cd ../..
+          cd src/foonathan_memory_vendor && git checkout ${{ inputs.foonathan_memory_vendor_branch }} && cd ../..
+          cd src/fastcdr && git checkout ${{ inputs.fastcdr_branch }} && cd ../..
+          cd src/fastdds && git checkout ${{ inputs.fastdds_branch }} && cd ../..
           cd src/dev-utils && git checkout ${{ inputs.utils_branch }} && cd ../..
 
       - name: Build workspace

diff --git a/.github/workflows/ci.repos b/.github/workflows/ci.repos
@@ -10,7 +10,7 @@ repositories:
     fastdds:
         type: git
         url: https://github.com/eProsima/Fast-DDS.git
-        version: master
+        version: 2.11.x
     dev-utils:
         type: git
         url: https://github.com/eProsima/dev-utils.git

diff --git a/ddspipe.repos b/ddspipe.repos
@@ -10,7 +10,7 @@ repositories:
     fastdds:
         type: git
         url: https://github.com/eProsima/Fast-DDS.git
-        version: master
+        version: 2.11.x
     dev_utils:
         type: git
         url: https://github.com/eProsima/dev-utils.git