From 2ea6bc3e24b26f31ecc98b2e906b966d14076203 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Tue, 29 Apr 2025 12:59:23 +0200 Subject: [PATCH] Build: update build tools Closes #12094 --- docs/user/config-file/v2.rst | 3 ++ readthedocs/builds/constants_docker.py | 31 ++++++++++--------- .../projects/tests/test_build_tasks.py | 2 +- .../rtd_tests/fixtures/spec/v2/schema.json | 4 ++- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/docs/user/config-file/v2.rst b/docs/user/config-file/v2.rst index 46d241709eb..174dc8c23a6 100644 --- a/docs/user/config-file/v2.rst +++ b/docs/user/config-file/v2.rst @@ -351,6 +351,7 @@ Ruby version to use. :Type: ``string`` :Options: - ``3.3`` + - ``3.4`` - ``latest`` (alias for the latest version available on Read the Docs) build.tools.rust @@ -367,6 +368,7 @@ Rust version to use. - ``1.75`` - ``1.78`` - ``1.82`` + - ``1.86`` - ``latest`` (alias for the latest version available on Read the Docs) build.tools.golang @@ -383,6 +385,7 @@ Go version to use. - ``1.21`` - ``1.22`` - ``1.23`` + - ``1.24`` - ``latest`` (alias for the latest version available on Read the Docs) build.apt_packages diff --git a/readthedocs/builds/constants_docker.py b/readthedocs/builds/constants_docker.py index 8948fc376e9..a4830e67f97 100644 --- a/readthedocs/builds/constants_docker.py +++ b/readthedocs/builds/constants_docker.py @@ -34,11 +34,11 @@ "3.6": "3.6.15", "3.7": "3.7.17", "3.8": "3.8.20", - "3.9": "3.9.20", - "3.10": "3.10.15", - "3.11": "3.11.10", - "3.12": "3.12.7", - "3.13": "3.13.0", + "3.9": "3.9.22", + "3.10": "3.10.17", + "3.11": "3.11.12", + "3.12": "3.12.10", + "3.13": "3.13.3", "miniconda3-4.7": "miniconda3-4.7.12", "miniconda3-3.12-24.1": "miniconda3-3.12-24.1.2-0", "miniconda3-3.12-24.9": "miniconda3-3.12-24.9.2-0", @@ -49,14 +49,15 @@ "nodejs": { "14": "14.21.3", "16": "16.20.2", - "18": "18.20.4", + "18": "18.20.8", "19": "19.9.0", - "20": "20.18.0", - "22": "22.11.0", # LTS - "23": "23.1.0", + "20": "20.19.1", + "22": "22.15.0", # LTS + "23": "23.11.0", }, "ruby": { "3.3": "3.3.5", + "3.4": "3.4.3", }, "rust": { "1.55": "1.55.0", @@ -66,6 +67,7 @@ "1.75": "1.75.0", "1.78": "1.78.0", "1.82": "1.82.0", + "1.86": "1.86.0", }, "golang": { "1.17": "1.17.13", @@ -73,8 +75,9 @@ "1.19": "1.19.13", "1.20": "1.20.14", "1.21": "1.21.13", - "1.22": "1.22.8", - "1.23": "1.23.2", + "1.22": "1.22.12", + "1.23": "1.23.8", + "1.24": "1.24.2", }, }, } @@ -92,6 +95,6 @@ _TOOLS["python"]["miniconda-latest"] = _TOOLS["python"]["miniconda3-3.12-24.9"] _TOOLS["python"]["mambaforge-latest"] = _TOOLS["python"]["mambaforge-23.11"] _TOOLS["nodejs"]["latest"] = _TOOLS["nodejs"]["23"] -_TOOLS["ruby"]["latest"] = _TOOLS["ruby"]["3.3"] -_TOOLS["rust"]["latest"] = _TOOLS["rust"]["1.82"] -_TOOLS["golang"]["latest"] = _TOOLS["golang"]["1.23"] +_TOOLS["ruby"]["latest"] = _TOOLS["ruby"]["3.4"] +_TOOLS["rust"]["latest"] = _TOOLS["rust"]["1.86"] +_TOOLS["golang"]["latest"] = _TOOLS["golang"]["1.24"] diff --git a/readthedocs/projects/tests/test_build_tasks.py b/readthedocs/projects/tests/test_build_tasks.py index eed6949eac2..170a068d8f8 100644 --- a/readthedocs/projects/tests/test_build_tasks.py +++ b/readthedocs/projects/tests/test_build_tasks.py @@ -577,7 +577,7 @@ def test_successful_build( }, "tools": { "python": { - "full_version": "3.13.0", + "full_version": "3.13.3", "version": "3", } }, diff --git a/readthedocs/rtd_tests/fixtures/spec/v2/schema.json b/readthedocs/rtd_tests/fixtures/spec/v2/schema.json index f11436c0ca6..5af7580625f 100644 --- a/readthedocs/rtd_tests/fixtures/spec/v2/schema.json +++ b/readthedocs/rtd_tests/fixtures/spec/v2/schema.json @@ -209,7 +209,7 @@ "enum": ["14", "16", "18", "19", "20", "22", "23", "latest"] }, "ruby": { - "enum": ["3.3", "latest"] + "enum": ["3.3", "3.4", "latest"] }, "rust": { "enum": [ @@ -220,6 +220,7 @@ "1.75", "1.78", "1.82", + "1.86", "latest" ] }, @@ -232,6 +233,7 @@ "1.21", "1.22", "1.23", + "1.24", "latest" ] }