Skip to content

Commit

Permalink
Revert "Refs #21309: Use Ubuntu 22.04 in CI and 20.04 in RTD until 24…
Browse files Browse the repository at this point in the history
….04 build is fixed"

This reverts commit 7f15097.

Signed-off-by: eduponz <eduardoponz@eprosima.com>
  • Loading branch information
EduPonz committed Jul 9, 2024
1 parent 63d4d3f commit 9a639b0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/reusable-ubuntu-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
- 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: false
upgrade: false

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ def configure_doxyfile(
sys.exit(doxygen_ret)

# Generate SWIG code.
swig_ret = subprocess.call('swig -python -doxygen -I{}/include \
swig_ret = subprocess.call('swig4.1 -python -doxygen -I{}/include \
-outdir {}/fastdds_python/src/swig -c++ -interface \
_fastdds_python -o \
{}/fastdds_python/src/swig/fastddsPYTHON_wrap.cxx \
Expand Down
4 changes: 2 additions & 2 deletions readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
version: 2

build:
os: ubuntu-20.04
os: ubuntu-24.04
tools:
python: "3.11"
apt_packages:
- plantuml
- swig
- swig4.1

# Build documentation in the docs/ directory with Sphinx
sphinx:
Expand Down

0 comments on commit 9a639b0

Please sign in to comment.