Fix master build to run on Ubuntu 24.04 (#856)

* Refs #21309: Fix master build to run on Ubuntu 24.04 Signed-off-by: JesusPoderoso <[email protected]> * Refs #21309: Downgrarde Swig version to 4.1 Signed-off-by: JesusPoderoso <[email protected]> --------- Signed-off-by: JesusPoderoso <[email protected]>
eProsima · Sep 18, 2024 · 30b7f05 · 30b7f05
1 parent 06dcd56
commit 30b7f05
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/nightly-ubuntu-ci.yml b/.github/workflows/nightly-ubuntu-ci.yml
@@ -11,7 +11,7 @@ jobs:
     with:
       # It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
       # https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
-      os-version: 'ubuntu-22.04'
+      os-version: 'ubuntu-24.04'
       label: 'nightly-ubuntu-ci-master'
       fastdds-docs-branch: 'master'
       fastdds-branch: 'master'

diff --git a/.github/workflows/reusable-ubuntu-ci.yml b/.github/workflows/reusable-ubuntu-ci.yml
@@ -6,7 +6,7 @@ on:
       os-version:
         description: 'The OS image for the workflow'
         required: false
-        default: 'ubuntu-22.04'
+        default: 'ubuntu-24.04'
         type: string
       label:
         description: 'ID associated to the workflow'
@@ -91,10 +91,13 @@ jobs:
         with:
           cmakeVersion: '3.22.6'
 
+      - name: Remove default swig version
+        run: sudo apt-get remove -y swig
+
       - name: Install apt dependencies
         uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
         with:
-          packages: libasio-dev libtinyxml2-dev libssl-dev swig doxygen imagemagick plantuml
+          packages: libasio-dev libtinyxml2-dev libssl-dev swig4.1 doxygen imagemagick plantuml
           update: true
           upgrade: false
 

diff --git a/.github/workflows/ubuntu-ci.yml b/.github/workflows/ubuntu-ci.yml
@@ -7,7 +7,7 @@ on:
       os-version:
         description: 'OS version to run the workflow'
         required: false
-        default: 'ubuntu-22.04'
+        default: 'ubuntu-24.04'
         type: string
       colcon-args:
         description: 'Extra arguments for colcon cli'
@@ -61,7 +61,7 @@ jobs:
     with:
       # It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
       # https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
-      os-version: ${{ inputs.os-version || 'ubuntu-22.04' }}
+      os-version: ${{ inputs.os-version || 'ubuntu-24.04' }}
       label: 'ubuntu-ci-master-main'
       colcon-args: ${{ inputs.colcon-args }}
       cmake-args: ${{ inputs.cmake-args }}