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

Build: add support for Ubuntu 24.04 LTS #11421

Merged
merged 4 commits into from
Jun 18, 2024
Merged

Build: add support for Ubuntu 24.04 LTS #11421

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35010b0
Build: add support for Ubuntu 24.04 LTS
humitos Jun 17, 2024
fcd8ad4
Update scripts/compile_version_upload_s3.sh
humitos Jun 17, 2024
64b9f88
Don't update Ubuntu latest yet
humitos Jun 18, 2024
2346b39
Merge branch 'humitos/add-support-ubuntu-24.04' of github.com:readthe…
humitos Jun 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 docs/user/config-file/v2.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ Image names refer to the operating system Read the Docs uses to build them.
Arbitrary Docker images are not supported.

:Type: ``string``
:Options: ``ubuntu-20.04``, ``ubuntu-22.04``, ``ubuntu-lts-latest``
:Options: ``ubuntu-20.04``, ``ubuntu-22.04``, ``ubuntu-24.04``, ``ubuntu-lts-latest``
:Required: ``true``

.. note::
Expand Down
3 changes: 2 additions & 1 deletion readthedocs/builds/constants_docker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"os": {
"ubuntu-20.04": f"{DOCKER_DEFAULT_IMAGE}:ubuntu-20.04",
"ubuntu-22.04": f"{DOCKER_DEFAULT_IMAGE}:ubuntu-22.04",
"ubuntu-24.04": f"{DOCKER_DEFAULT_IMAGE}:ubuntu-24.04",
},
# Mapping of build.tools options to specific versions.
"tools": {
Expand Down Expand Up @@ -75,7 +76,7 @@
# Set latest aliases for OS and tools.
_OS = RTD_DOCKER_BUILD_SETTINGS["os"]
_TOOLS = RTD_DOCKER_BUILD_SETTINGS["tools"]
_OS["ubuntu-lts-latest"] = _OS["ubuntu-22.04"]
_OS["ubuntu-lts-latest"] = _OS["ubuntu-24.04"]
humitos marked this conversation as resolved.
Show resolved Hide resolved
_TOOLS["python"]["3"] = _TOOLS["python"]["3.12"]
_TOOLS["python"]["latest"] = _TOOLS["python"]["3"]
_TOOLS["python"]["miniconda-latest"] = _TOOLS["python"]["miniconda3-3.12-24.1"]
Expand Down
1 change: 1 addition & 0 deletions readthedocs/rtd_tests/fixtures/spec/v2/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"enum": [
"ubuntu-20.04",
"ubuntu-22.04",
"ubuntu-24.04",
"ubuntu-lts-latest"
]
},
Expand Down
4 changes: 2 additions & 2 deletions scripts/compile_version_upload_s3.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ set -x # Echo commands

# Define variables
SLEEP=900 # Container timeout
OS="${OS:-ubuntu-22.04}" # Docker image name
OS="${OS:-ubuntu-24.04}" # Docker image name

TOOL=$1
VERSION=$2

# https://stackoverflow.com/questions/59895/how-can-i-get-the-source-directory-of-a-bash-script-from-within-the-script-itsel
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"

# Spin up a container with the Ubuntu 20.04 LTS image
# Spin up a container with the Ubuntu LTS image
humitos marked this conversation as resolved.
Show resolved Hide resolved
CONTAINER_ID=$(docker run --user docs --rm --detach --volume ${SCRIPT_DIR}/python-build.diff:/tmp/python-build.diff readthedocs/build:$OS sleep $SLEEP)
echo "Running all the commands in Docker container: $CONTAINER_ID"

Expand Down
Loading