-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Ubuntu 20 Deprecation changes #11748
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.
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
Conversation
85117b0
to
29ed123
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
The PR removes all Ubuntu 20.04 references from the project and updates documentation and configuration files to reflect support for Ubuntu 22.04 and Ubuntu 24.04. Key changes include:
- Removing Ubuntu 20.04 references from disk image documentation.
- Updating table entries and dependency lists in README.md and related markdown files.
- Adjusting example paths in CONTRIBUTING.md to align with the new Ubuntu version.
Reviewed Changes
Copilot reviewed 8 out of 25 changed files in this pull request and generated 2 comments.
File | Description |
---|---|
docs/create-image-and-azure-resources.md | Updated text to replace Ubuntu 20.04 with Ubuntu 22.04/24.04 in disk image generation instructions. |
README.md | Updated table rows for Ubuntu versions; however, unresolved merge conflict markers are present. |
CONTRIBUTING.md | Modified example reference from Ubuntu2004-Readme.md to Ubuntu2204-Readme.md. |
Files not reviewed (17)
- .github/workflows/ubuntu2004.yml: Language not supported
- helpers/GenerateResourcesAndImage.ps1: Language not supported
- images/ubuntu/assets/ubuntu2004.conf: Language not supported
- images/ubuntu/scripts/build/install-aliyun-cli.sh: Language not supported
- images/ubuntu/scripts/build/install-container-tools.sh: Language not supported
- images/ubuntu/scripts/build/install-erlang.sh: Language not supported
- images/ubuntu/scripts/build/install-hhvm.sh: Language not supported
- images/ubuntu/scripts/build/install-mongodb.sh: Language not supported
- images/ubuntu/scripts/build/install-oc-cli.sh: Language not supported
- images/ubuntu/scripts/build/install-phantomjs.sh: Language not supported
- images/ubuntu/scripts/build/install-php.sh: Language not supported
- images/ubuntu/scripts/build/install-ruby.sh: Language not supported
- images/ubuntu/scripts/build/install-rust.sh: Language not supported
- images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1: Language not supported
- images/ubuntu/scripts/docs-gen/SoftwareReport.WebServers.psm1: Language not supported
- images/ubuntu/scripts/helpers/Common.Helpers.psm1: Language not supported
- images/ubuntu/scripts/helpers/os.sh: Language not supported
README.md
Outdated
<<<<<<< HEAD | ||
| Ubuntu 20.04 <sup>deprecated</sup> | `ubuntu-20.04` | [ubuntu-20.04] |  | | ||
| macOS 15 | `macos-15-large`| [macOS-15] |  | | ||
| macOS 15 Arm64 | `macos-15` or `macos-15-xlarge` | [macOS-15-arm64] |  | | ||
======= | ||
| macOS 15 <sup>beta</sup> | `macos-15-large`| [macOS-15] |  | | ||
| macOS 15 Arm64 <sup>beta</sup> | `macos-15` or `macos-15-xlarge` | [macOS-15-arm64] |  | | ||
>>>>>>> b7d78e9c (Updating .md files) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unresolved merge conflict marker detected in the Ubuntu table row. Please resolve the conflict markers to ensure the documentation renders correctly.
<<<<<<< HEAD | |
| Ubuntu 20.04 <sup>deprecated</sup> | `ubuntu-20.04` | [ubuntu-20.04] |  | | |
| macOS 15 | `macos-15-large`| [macOS-15] |  | | |
| macOS 15 Arm64 | `macos-15` or `macos-15-xlarge` | [macOS-15-arm64] |  | | |
======= | |
| macOS 15 <sup>beta</sup> | `macos-15-large`| [macOS-15] |  | | |
| macOS 15 Arm64 <sup>beta</sup> | `macos-15` or `macos-15-xlarge` | [macOS-15-arm64] |  | | |
>>>>>>> b7d78e9c (Updating .md files) | |
| Ubuntu 20.04 <sup>deprecated</sup> | `ubuntu-20.04` | [ubuntu-20.04] |  | | |
| macOS 15 <sup>beta</sup> | `macos-15-large`| [macOS-15] |  | | |
| macOS 15 Arm64 <sup>beta</sup> | `macos-15` or `macos-15-xlarge` | [macOS-15-arm64] |  | |
Copilot uses AI. Check for mistakes.
README.md
Outdated
<<<<<<< HEAD | ||
| Ubuntu | [APT](https://wiki.debian.org/Apt) | [containers](https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) (Ubuntu 20 only) <br/> [docker](https://download.docker.com/linux/ubuntu) (Ubuntu20 0nly) <br/> [Eclipse-Temurin (Adoptium)](https://packages.adoptium.net/artifactory/deb/) <br/> [Erlang](https://packages.erlang-solutions.com/ubuntu) <br/> [Firefox](https://ppa.launchpad.net/mozillateam/ppa/ubuntu) <br/> [git-lfs](https://packagecloud.io/install/repositories/github/git-lfs) <br/> [git](https://launchpad.net/~git-core/+archive/ubuntu/ppa) <br/> [Google Cloud CLI](https://packages.cloud.google.com/apt) <br/> [Heroku](https://cli-assets.heroku.com/channels/stable/apt) <br/> [HHvm](https://dl.hhvm.com/ubuntu) <br/> [MongoDB](https://repo.mongodb.org/apt/ubuntu) <br/> [Mono](https://download.mono-project.com/repo/ubuntu) <br/> [MS Edge](https://packages.microsoft.com/repos/edge) <br/> [PostgreSQL](https://apt.postgresql.org/pub/repos/apt/) <br/> [R](https://cloud.r-project.org/bin/linux/ubuntu) | | ||
======= | ||
| Ubuntu | [APT](https://wiki.debian.org/Apt) | [Eclipse-Temurin (Adoptium)](https://packages.adoptium.net/artifactory/deb/) <br/> [Erlang](https://packages.erlang-solutions.com/ubuntu) <br/> [Firefox](http://ppa.launchpad.net/mozillateam/ppa/ubuntu) <br/> [git-lfs](https://packagecloud.io/install/repositories/github/git-lfs) <br/> [git](https://launchpad.net/~git-core/+archive/ubuntu/ppa) <br/> [Google Cloud CLI](https://packages.cloud.google.com/apt) <br/> [Heroku](https://cli-assets.heroku.com/channels/stable/apt) <br/> [HHvm](https://dl.hhvm.com/ubuntu) <br/> [MongoDB](https://repo.mongodb.org/apt/ubuntu) <br/> [Mono](https://download.mono-project.com/repo/ubuntu) <br/> [MS Edge](https://packages.microsoft.com/repos/edge) <br/> [PostgreSQL](https://apt.postgresql.org/pub/repos/apt/) <br/> [R](https://cloud.r-project.org/bin/linux/ubuntu) | | ||
>>>>>>> b7d78e9c (Updating .md files) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unresolved merge conflict markers found in the Ubuntu dependency section. Please resolve these markers to finalize the changes.
<<<<<<< HEAD | |
| Ubuntu | [APT](https://wiki.debian.org/Apt) | [containers](https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) (Ubuntu 20 only) <br/> [docker](https://download.docker.com/linux/ubuntu) (Ubuntu20 0nly) <br/> [Eclipse-Temurin (Adoptium)](https://packages.adoptium.net/artifactory/deb/) <br/> [Erlang](https://packages.erlang-solutions.com/ubuntu) <br/> [Firefox](https://ppa.launchpad.net/mozillateam/ppa/ubuntu) <br/> [git-lfs](https://packagecloud.io/install/repositories/github/git-lfs) <br/> [git](https://launchpad.net/~git-core/+archive/ubuntu/ppa) <br/> [Google Cloud CLI](https://packages.cloud.google.com/apt) <br/> [Heroku](https://cli-assets.heroku.com/channels/stable/apt) <br/> [HHvm](https://dl.hhvm.com/ubuntu) <br/> [MongoDB](https://repo.mongodb.org/apt/ubuntu) <br/> [Mono](https://download.mono-project.com/repo/ubuntu) <br/> [MS Edge](https://packages.microsoft.com/repos/edge) <br/> [PostgreSQL](https://apt.postgresql.org/pub/repos/apt/) <br/> [R](https://cloud.r-project.org/bin/linux/ubuntu) | | |
======= | |
| Ubuntu | [APT](https://wiki.debian.org/Apt) | [Eclipse-Temurin (Adoptium)](https://packages.adoptium.net/artifactory/deb/) <br/> [Erlang](https://packages.erlang-solutions.com/ubuntu) <br/> [Firefox](http://ppa.launchpad.net/mozillateam/ppa/ubuntu) <br/> [git-lfs](https://packagecloud.io/install/repositories/github/git-lfs) <br/> [git](https://launchpad.net/~git-core/+archive/ubuntu/ppa) <br/> [Google Cloud CLI](https://packages.cloud.google.com/apt) <br/> [Heroku](https://cli-assets.heroku.com/channels/stable/apt) <br/> [HHvm](https://dl.hhvm.com/ubuntu) <br/> [MongoDB](https://repo.mongodb.org/apt/ubuntu) <br/> [Mono](https://download.mono-project.com/repo/ubuntu) <br/> [MS Edge](https://packages.microsoft.com/repos/edge) <br/> [PostgreSQL](https://apt.postgresql.org/pub/repos/apt/) <br/> [R](https://cloud.r-project.org/bin/linux/ubuntu) | | |
>>>>>>> b7d78e9c (Updating .md files) | |
| Ubuntu | [APT](https://wiki.debian.org/Apt) | [containers](https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) (Ubuntu 20 only) <br/> [docker](https://download.docker.com/linux/ubuntu) (Ubuntu 20 only) <br/> [Eclipse-Temurin (Adoptium)](https://packages.adoptium.net/artifactory/deb/) <br/> [Erlang](https://packages.erlang-solutions.com/ubuntu) <br/> [Firefox](https://ppa.launchpad.net/mozillateam/ppa/ubuntu) <br/> [git-lfs](https://packagecloud.io/install/repositories/github/git-lfs) <br/> [git](https://launchpad.net/~git-core/+archive/ubuntu/ppa) <br/> [Google Cloud CLI](https://packages.cloud.google.com/apt) <br/> [Heroku](https://cli-assets.heroku.com/channels/stable/apt) <br/> [HHvm](https://dl.hhvm.com/ubuntu) <br/> [MongoDB](https://repo.mongodb.org/apt/ubuntu) <br/> [Mono](https://download.mono-project.com/repo/ubuntu) <br/> [MS Edge](https://packages.microsoft.com/repos/edge) <br/> [PostgreSQL](https://apt.postgresql.org/pub/repos/apt/) <br/> [R](https://cloud.r-project.org/bin/linux/ubuntu) | |
Copilot uses AI. Check for mistakes.
29ed123
to
0017619
Compare
836190a
to
1d88a3e
Compare
c7e7afc
to
fbcf5e3
Compare
README.md
Outdated
@@ -22,9 +22,14 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | |||
| --------------------|---------------------|--------------------|--------------------| | |||
| Ubuntu 24.04 | `ubuntu-latest` or `ubuntu-24.04` | [ubuntu-24.04] |  | | |||
| Ubuntu 22.04 | `ubuntu-22.04` | [ubuntu-22.04] |  | | |||
<<<<<<< HEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unresolved merge conflict. Please fix it.
@@ -10,6 +10,7 @@ source $HELPER_SCRIPTS/install.sh | |||
|
|||
apt-get install ruby-full | |||
|
|||
<<<<<<< HEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Check this please
@@ -31,6 +32,8 @@ if is_ubuntu20; then | |||
gem install google-cloud-core -v 1.7.1 | |||
fi | |||
|
|||
======= | |||
>>>>>>> 1f877d0a (Ubuntu 20 Deprecation updates) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This one
@@ -23,10 +23,13 @@ if is_ubuntu22; then | |||
cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated | |||
fi | |||
|
|||
<<<<<<< HEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
THis one
This reverts commit 80a1ca9.
Summary :
Planned changes :
Next Steps :
Related issues:
#11101
Check list :