Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[21578] Fix master build to run on Ubuntu 24.04 #856

Merged
merged 2 commits into from
Sep 18, 2024
Merged

[21578] Fix master build to run on Ubuntu 24.04 #856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05af737
Refs #21309: Fix master build to run on Ubuntu 24.04
JesusPoderoso Jul 9, 2024
0ad1b10
Refs #21309: Downgrarde Swig version to 4.1
JesusPoderoso Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/nightly-ubuntu-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/reusable-ubuntu-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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 }}
Expand Down
Loading