diff --git a/.github/workflows/github-actions-cron-test-installer.yml b/.github/workflows/github-actions-cron-test-installer.yml index d63c0f7d86..604824eab3 100644 --- a/.github/workflows/github-actions-cron-test-installer.yml +++ b/.github/workflows/github-actions-cron-test-installer.yml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - os: ["ubuntu22.04"] + os: ["ubuntu26.04", "ubuntu24.04"] runs-on: ${{ vars.USE_SELF_HOSTED == 'true' && 'self-hosted-ubuntu-26.04' || 'ubuntu-26.04' }} env: INSTALLER_TAG: installer-${{ github.run_id }}-${{ github.run_attempt }} diff --git a/.github/workflows/github-actions-publish-docker-images.yml b/.github/workflows/github-actions-publish-docker-images.yml index 5e65289756..5b493560ba 100644 --- a/.github/workflows/github-actions-publish-docker-images.yml +++ b/.github/workflows/github-actions-publish-docker-images.yml @@ -53,7 +53,7 @@ jobs: strategy: fail-fast: false matrix: - os: [["ubuntu22.04", "ubuntu:22.04"]] + os: [["ubuntu26.04", "ubuntu:26.04"], ["ubuntu24.04", "ubuntu:24.04"]] runs-on: ${{ vars.USE_SELF_HOSTED == 'true' && 'self-hosted-ubuntu-26.04' || 'ubuntu-26.04' }} steps: - name: Check out repository code @@ -97,7 +97,7 @@ jobs: strategy: fail-fast: false matrix: - os: ["ubuntu22.04"] + os: ["ubuntu26.04", "ubuntu24.04"] runs-on: ${{ vars.USE_SELF_HOSTED == 'true' && 'self-hosted-ubuntu-26.04' || 'ubuntu-26.04' }} steps: - name: Free Disk Space diff --git a/build_openroad.sh b/build_openroad.sh index b6d26dc754..0eef046bd5 100755 --- a/build_openroad.sh +++ b/build_openroad.sh @@ -26,7 +26,7 @@ YOSYS_ARGS="" OPENROAD_APP_USER_ARGS=() OPENROAD_APP_ARGS=() -DOCKER_OS_NAME="ubuntu22.04" +DOCKER_OS_NAME="ubuntu26.04" PROC=-1 WITH_VERIFIC=0 @@ -101,7 +101,7 @@ Options: Options valid only for Docker builds: -c, --copy-platforms Copy platforms to inside docker image. - --os=DOCKER_OS_NAME Use ubuntu22.04 (default). + --os=DOCKER_OS_NAME Use ubuntu26.04 (default) or ubuntu24.04. This script builds the OpenROAD tools: openroad, yosys and yosys plugins. By default, the tools will be built from the linked submodule hashes. diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index b92bec521d..df31e072e7 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -1,7 +1,7 @@ # create image with dependencies needed to compile openroad app and run openroad flow scripts # NOTE: don't use this file directly unless you know what you are doing, # instead use etc/DockerHelper.sh -ARG fromImage=ubuntu:22.04 +ARG fromImage=ubuntu:26.04 FROM $fromImage diff --git a/docs/user/BuildLocally.md b/docs/user/BuildLocally.md index c04d55d8eb..15ccf7ff9c 100644 --- a/docs/user/BuildLocally.md +++ b/docs/user/BuildLocally.md @@ -4,7 +4,7 @@ The `setup.sh` script installs all of the dependencies, including OpenROAD dependencies, if they are not already installed. -Supported configurations are: Ubuntu 22.04, RHEL 8 and RockyLinux 9. +Supported configurations are: Ubuntu 26.04, Ubuntu 24.04, RHEL 8 and RockyLinux 9. ``` shell git clone --recursive https://github.com/The-OpenROAD-Project/OpenROAD-flow-scripts diff --git a/docs/user/BuildWithDocker.md b/docs/user/BuildWithDocker.md index adbe6ae92e..0b79b8c45f 100644 --- a/docs/user/BuildWithDocker.md +++ b/docs/user/BuildWithDocker.md @@ -25,7 +25,7 @@ then is recommended that you restrict the number of CPUs used by the scripts ::: ``` shell -docker run --rm ubuntu:22.04 nproc +docker run --rm ubuntu:26.04 nproc ``` ### Build Using Docker from pre-built binaries @@ -57,7 +57,7 @@ do follow the instructions below. #### Clone and Build -The following instructions build the docker image with Ubuntu 22.04 as the base OS: +The following instructions build the docker image with Ubuntu 26.04 as the base OS: ``` shell @@ -145,7 +145,7 @@ Do refer to the documentation [here](./DockerShell.md). The following instructions build the docker image with a parameterized OS in two stages. These are for CI and developers that wish to use an OS other -than Ubuntu 22.04; regular users should use the steps from previous sections. +than Ubuntu 26.04; regular users should use the steps from previous sections. The dev stage installs all dependencies and packages required to run OpenROAD and OpenROAD Flow Scripts. The build stage generates all binaries needed to run the flow (i.e., `openroad` and `yosys`). @@ -156,3 +156,5 @@ cd OpenROAD-flow-scripts ./etc/DockerHelper.sh create -target=dev -os=$OS_NAME ./etc/DockerHelper.sh create -target=builder -os=$OS_NAME ``` + +Valid values for `$OS_NAME` are `ubuntu26.04` and `ubuntu24.04`. diff --git a/docs/user/BuildWithWSL.md b/docs/user/BuildWithWSL.md index 752343bbe0..374157946a 100644 --- a/docs/user/BuildWithWSL.md +++ b/docs/user/BuildWithWSL.md @@ -2,7 +2,7 @@ Windows Subsystem for Linux, or WSL for short is a way for you to mount a Linux-based OS onto your Windows machine, allowing you to build OpenROAD-flow-scripts both locally and via Docker. ## Install WSL -Instructions to install WSL can be found [here](https://learn.microsoft.com/en-us/windows/wsl/install). You may use any kernel supported, such as: Ubuntu 22.04, RHEL 8, RockyLinux 9. +Instructions to install WSL can be found [here](https://learn.microsoft.com/en-us/windows/wsl/install). You may use any kernel supported, such as: Ubuntu 26.04, Ubuntu 24.04, RHEL 8, RockyLinux 9. We recommend that users follow the Docker build by continuing onto the guide below. However, if you wish to install locally, you may follow the build locally instructions [here](./BuildLocally.md). @@ -17,11 +17,12 @@ You need to enable the following options to allow WSL to use Docker. General > Use the WSL 2 Based engine (should be default selection) ![WSL1](../images/wsl_1.webp) -Resources > WSL integration > Enable integration with my default WSL distro and select "Ubuntu-22.04", or the distribution you installed. +Resources > WSL integration > Enable integration with my default WSL distro and select "Ubuntu-26.04", or the distribution you installed. + ![WSL2](../images/wsl_2.webp) ## Accessing WSL -You may access WSL from the app named "Ubuntu 22.04 LTS". Run the following: +You may access WSL from the app named "Ubuntu 26.04 LTS". Run the following: ``` sudo apt-get update; sudo apt-get upgrade; sudo apt install -y build-essential python3 python3-venv python3-pip make ``` diff --git a/etc/DependencyInstaller.sh b/etc/DependencyInstaller.sh index 3b8c2ac218..dc3cb17cb3 100755 --- a/etc/DependencyInstaller.sh +++ b/etc/DependencyInstaller.sh @@ -421,8 +421,10 @@ _installUbuntuPackages() { klayoutChecksum=6dfffa50f385881768dee30bdc759608 elif [[ $1 == 24.04 ]]; then klayoutChecksum=0181713e60891e461d6d1664c1b8e213 + elif [[ $1 == 26.04 ]]; then + klayoutChecksum=904f60fd05c3a5029cab8a2840029f49 else - echo "Unsupported Ubuntu version $1. Supported versions: 22.04, 24.04. Please upgrade to a supported LTS release or install KLayout ${klayoutVersion} manually from https://www.klayout.org/build.html" + echo "Unsupported Ubuntu version $1. KLayout ${klayoutVersion} packages are pinned for 22.04, 24.04, and 26.04. Please upgrade to a supported LTS release or install KLayout ${klayoutVersion} manually from https://www.klayout.org/build.html" exit 1 fi wget https://www.klayout.org/downloads/Ubuntu-${1%.*}/klayout_${klayoutVersion}-1_amd64.deb @@ -656,7 +658,7 @@ case "${os}" in "CentOS Linux" | "Red Hat Enterprise Linux"* | "AlmaLinux" | "Rocky Linux") # Enterprise Linux support - dispatch based on specific version if [[ ${CI} == "yes" ]]; then - echo "WARNING: Installing CI dependencies is only supported on Ubuntu 22.04" >&2 + echo "WARNING: Installing CI dependencies is only supported on Ubuntu 24.04 and 26.04" >&2 fi # Detect EL version to choose appropriate functions @@ -719,13 +721,15 @@ case "${os}" in _installCmake fi if [[ $version != "rodete" ]]; then - if [[ "${option}" == "common" || "${option}" == "all" ]]; then - if _versionCompare ${version} -lt 23.04 ; then + if _versionCompare ${version} -lt 23.04 ; then + if [[ "${option}" == "common" || "${option}" == "all" ]]; then _installPipCommon - else - if [[ "${option}" == "base" || "${option}" == "all" ]]; then - _installPipSystem - fi + fi + else + # Python packages come from apt (PEP 668), so they belong + # with the other system packages in -base. + if [[ "${option}" == "base" || "${option}" == "all" ]]; then + _installPipSystem fi fi else @@ -734,7 +738,7 @@ case "${os}" in ;; "Darwin" ) if [[ ${CI} == "yes" ]]; then - echo "WARNING: Installing CI dependencies is only supported on Ubuntu 22.04" >&2 + echo "WARNING: Installing CI dependencies is only supported on Ubuntu 24.04 and 26.04" >&2 fi _installORDependencies if [[ "${option}" == "base" || "${option}" == "all" ]]; then diff --git a/etc/DockerHelper.sh b/etc/DockerHelper.sh index 69da539cc1..0576d711af 100755 --- a/etc/DockerHelper.sh +++ b/etc/DockerHelper.sh @@ -21,7 +21,7 @@ usage: $0 [CMD] [OPTIONS] push Push the docker image to Docker Hub OPTIONS: - -os=OS_NAME Use ubuntu22.04 (default). + -os=OS_NAME Use ubuntu26.04 (default) or ubuntu24.04. -target=TARGET Choose target for the Docker image: 'dev': os + packages to compile app 'builder': os + packages to compile app + @@ -45,8 +45,11 @@ EOF _setup() { case "${os}" in - "ubuntu22.04") - osBaseImage="ubuntu:22.04" + "ubuntu24.04") + osBaseImage="ubuntu:24.04" + ;; + "ubuntu26.04") + osBaseImage="ubuntu:26.04" ;; *) echo "Target OS ${os} not supported" >&2 @@ -183,7 +186,7 @@ if [[ -z $(command -v "${_rule}") ]]; then fi # default values, can be overwritten by command line arguments -os="ubuntu22.04" +os="ubuntu26.04" target="dev" numThreads="-1" tag=""