From 0192f59031a0ba4fc4e3f2e0bd9f4d148d88ac73 Mon Sep 17 00:00:00 2001 From: Alena Sviridenko Date: Wed, 17 Mar 2021 20:30:30 +0300 Subject: [PATCH] [March 17] Remove all notes about ubuntu-latest migration and fix labels (#18243) Co-authored-by: Sarah Edwards --- .../actions/reference/workflow-syntax-for-github-actions.md | 1 - .../about-github-hosted-runners.md | 1 - data/reusables/github-actions/supported-github-runners.md | 4 ++-- data/reusables/github-actions/ubuntu-runner-preview.md | 5 ----- 4 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 data/reusables/github-actions/ubuntu-runner-preview.md diff --git a/content/actions/reference/workflow-syntax-for-github-actions.md b/content/actions/reference/workflow-syntax-for-github-actions.md index 9883e1bca3..c5431f7372 100644 --- a/content/actions/reference/workflow-syntax-for-github-actions.md +++ b/content/actions/reference/workflow-syntax-for-github-actions.md @@ -314,7 +314,6 @@ Available {% data variables.product.prodname_dotcom %}-hosted runner types are: {% data reusables.github-actions.supported-github-runners %} -{% data reusables.github-actions.ubuntu-runner-preview %} {% data reusables.github-actions.macos-runner-preview %} ##### Example diff --git a/content/actions/using-github-hosted-runners/about-github-hosted-runners.md b/content/actions/using-github-hosted-runners/about-github-hosted-runners.md index bbcebb10c5..8a6228e0bb 100644 --- a/content/actions/using-github-hosted-runners/about-github-hosted-runners.md +++ b/content/actions/using-github-hosted-runners/about-github-hosted-runners.md @@ -55,7 +55,6 @@ Hardware specification for macOS virtual machines: {% data reusables.github-actions.supported-github-runners %} -{% data reusables.github-actions.ubuntu-runner-preview %} {% data reusables.github-actions.macos-runner-preview %} Workflow logs list the runner used to run a job. For more information, see "[Viewing workflow run history](/actions/managing-workflow-runs/viewing-workflow-run-history)." diff --git a/data/reusables/github-actions/supported-github-runners.md b/data/reusables/github-actions/supported-github-runners.md index 3af3da15cb..514e6e3e37 100644 --- a/data/reusables/github-actions/supported-github-runners.md +++ b/data/reusables/github-actions/supported-github-runners.md @@ -1,8 +1,8 @@ | Virtual environment | YAML workflow label | | --------------------|---------------------| | Windows Server 2019 | `windows-latest` or `windows-2019` | -| Ubuntu 20.04 | `ubuntu-latest` (see note) or `ubuntu-20.04` | -| Ubuntu 18.04 | `ubuntu-latest` (see note) or `ubuntu-18.04` | +| Ubuntu 20.04 | `ubuntu-latest` or `ubuntu-20.04` | +| Ubuntu 18.04 | `ubuntu-18.04` | | Ubuntu 16.04 | `ubuntu-16.04` | | macOS Big Sur 11.0 | `macos-11.0` | | macOS Catalina 10.15 | `macos-latest` or `macos-10.15` | diff --git a/data/reusables/github-actions/ubuntu-runner-preview.md b/data/reusables/github-actions/ubuntu-runner-preview.md deleted file mode 100644 index 6eb91edc13..0000000000 --- a/data/reusables/github-actions/ubuntu-runner-preview.md +++ /dev/null @@ -1,5 +0,0 @@ -{% note %} - -**Note:** The `ubuntu-latest` label is currently being migrated from the Ubuntu 18.04 virtual environment to Ubuntu 20.04. Specifying the `ubuntu-latest` label during the migration might use either virtual environment. To explicitly use Ubuntu 20.04 or Ubuntu 18.04, specify `ubuntu-20.04` or `ubuntu-18.04`. When the migration is complete, `ubuntu-latest` will use the Ubuntu 20.04 virtual environment. For more information about the migration, see "[Ubuntu-latest workflows will use Ubuntu-20.04](https://github.com/actions/virtual-environments/issues/1816)." - -{% endnote %}