Skip to content

Commit 30b7f05

Browse files
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 <jesuspoderoso@eprosima.com> * Refs #21309: Downgrarde Swig version to 4.1 Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> --------- Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
1 parent 06dcd56 commit 30b7f05

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

.github/workflows/nightly-ubuntu-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
with:
1212
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
1313
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
14-
os-version: 'ubuntu-22.04'
14+
os-version: 'ubuntu-24.04'
1515
label: 'nightly-ubuntu-ci-master'
1616
fastdds-docs-branch: 'master'
1717
fastdds-branch: 'master'

.github/workflows/reusable-ubuntu-ci.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
os-version:
77
description: 'The OS image for the workflow'
88
required: false
9-
default: 'ubuntu-22.04'
9+
default: 'ubuntu-24.04'
1010
type: string
1111
label:
1212
description: 'ID associated to the workflow'
@@ -91,10 +91,13 @@ jobs:
9191
with:
9292
cmakeVersion: '3.22.6'
9393

94+
- name: Remove default swig version
95+
run: sudo apt-get remove -y swig
96+
9497
- name: Install apt dependencies
9598
uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
9699
with:
97-
packages: libasio-dev libtinyxml2-dev libssl-dev swig doxygen imagemagick plantuml
100+
packages: libasio-dev libtinyxml2-dev libssl-dev swig4.1 doxygen imagemagick plantuml
98101
update: true
99102
upgrade: false
100103

.github/workflows/ubuntu-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
os-version:
88
description: 'OS version to run the workflow'
99
required: false
10-
default: 'ubuntu-22.04'
10+
default: 'ubuntu-24.04'
1111
type: string
1212
colcon-args:
1313
description: 'Extra arguments for colcon cli'
@@ -61,7 +61,7 @@ jobs:
6161
with:
6262
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
6363
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
64-
os-version: ${{ inputs.os-version || 'ubuntu-22.04' }}
64+
os-version: ${{ inputs.os-version || 'ubuntu-24.04' }}
6565
label: 'ubuntu-ci-master-main'
6666
colcon-args: ${{ inputs.colcon-args }}
6767
cmake-args: ${{ inputs.cmake-args }}

0 commit comments

Comments
 (0)