diff --git a/content/actions/automating-builds-and-tests/building-and-testing-python.md b/content/actions/automating-builds-and-tests/building-and-testing-python.md index cfe00683e5..0113e28b92 100644 --- a/content/actions/automating-builds-and-tests/building-and-testing-python.md +++ b/content/actions/automating-builds-and-tests/building-and-testing-python.md @@ -16,7 +16,7 @@ topics: - Python shortTitle: Build & test Python --- - + {% data reusables.actions.enterprise-github-hosted-runners %} ## Introduction @@ -115,7 +115,7 @@ jobs: runs-on: ubuntu-latest strategy: # You can use PyPy versions in python-version. - # For example, {% ifversion actions-node16-action %}pypy2.7 and pypy3.9{% else %}pypy2 and pypy3{% endif %} + # For example, pypy2.7 and pypy3.9 matrix: python-version: ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11"] @@ -176,7 +176,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", {% ifversion actions-node16-action %}pypy2.7, pypy3.9{% else %}pypy2, pypy3{% endif %}] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", pypy2.7, pypy3.9] exclude: - os: macos-latest python-version: "3.7" diff --git a/content/code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github.md b/content/code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github.md index be481ba178..adca9f93cb 100644 --- a/content/code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github.md +++ b/content/code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github.md @@ -60,7 +60,7 @@ Your workflow will need to use the `upload-sarif` action, which is part of the ` - `sarif-file`, which configures the file or directory of SARIF files to be uploaded. The directory or file path is relative to the root of the repository. - `category` (optional), which assigns a category for results in the SARIF file. This enables you to analyze the same commit in multiple ways and review the results using the {% data variables.product.prodname_code_scanning %} views in {% data variables.product.prodname_dotcom %}. For example, you can analyze using multiple tools, and in mono-repos, you can analyze different slices of the repository based on the subset of changed files. -For more information see the [`upload-sarif` action](https://github.com/github/codeql-action/tree/{% ifversion actions-node16-action %}v2{% else %}v1{% endif %}/upload-sarif). +For more information see the [`upload-sarif` action](https://github.com/github/codeql-action/tree/v2/upload-sarif). The `upload-sarif` action can be configured to run when the `push` and `scheduled` event occur. For more information about {% data variables.product.prodname_actions %} events, see "[AUTOTITLE](/actions/using-workflows/events-that-trigger-workflows)." diff --git a/data/features/actions-node16-action.yml b/data/features/actions-node16-action.yml deleted file mode 100644 index 7d412fe8cf..0000000000 --- a/data/features/actions-node16-action.yml +++ /dev/null @@ -1,7 +0,0 @@ -# Reference: #6447 -# Versions of actions used in workflows have been updated to their Node 16 version. -versions: - fpt: '*' - ghec: '*' - ghes: '>=3.5' - ghae: '>= 3.5' diff --git a/data/reusables/actions/action-cache.md b/data/reusables/actions/action-cache.md index 8899fd7165..8c7b1182dd 100644 --- a/data/reusables/actions/action-cache.md +++ b/data/reusables/actions/action-cache.md @@ -1 +1 @@ -actions/cache@{% ifversion actions-node16-action %}v3{% else %}v2{% endif %} +actions/cache@v3 diff --git a/data/reusables/actions/action-checkout.md b/data/reusables/actions/action-checkout.md index 267388dd8a..decf1c7d00 100644 --- a/data/reusables/actions/action-checkout.md +++ b/data/reusables/actions/action-checkout.md @@ -1 +1 @@ -actions/checkout@{% ifversion actions-node16-action %}v3{% else %}v2{% endif %} +actions/checkout@v4 diff --git a/data/reusables/actions/action-codeql-action-analyze.md b/data/reusables/actions/action-codeql-action-analyze.md index 21a0532542..a2d248a101 100644 --- a/data/reusables/actions/action-codeql-action-analyze.md +++ b/data/reusables/actions/action-codeql-action-analyze.md @@ -1 +1 @@ -github/codeql-action/analyze@{% ifversion actions-node16-action %}v2{% else %}v1{% endif %} +github/codeql-action/analyze@v2 diff --git a/data/reusables/actions/action-codeql-action-autobuild.md b/data/reusables/actions/action-codeql-action-autobuild.md index b72b8f9bd4..858102611f 100644 --- a/data/reusables/actions/action-codeql-action-autobuild.md +++ b/data/reusables/actions/action-codeql-action-autobuild.md @@ -1 +1 @@ -github/codeql-action/autobuild@{% ifversion actions-node16-action %}v2{% else %}v1{% endif %} +github/codeql-action/autobuild@v2 diff --git a/data/reusables/actions/action-codeql-action-init.md b/data/reusables/actions/action-codeql-action-init.md index 3e0d94ea35..45f1f2262a 100644 --- a/data/reusables/actions/action-codeql-action-init.md +++ b/data/reusables/actions/action-codeql-action-init.md @@ -1 +1 @@ -github/codeql-action/init@{% ifversion actions-node16-action %}v2{% else %}v1{% endif %} +github/codeql-action/init@v2 diff --git a/data/reusables/actions/action-codeql-action-upload-sarif.md b/data/reusables/actions/action-codeql-action-upload-sarif.md index c91f71820f..3733ab6c3e 100644 --- a/data/reusables/actions/action-codeql-action-upload-sarif.md +++ b/data/reusables/actions/action-codeql-action-upload-sarif.md @@ -1 +1 @@ -github/codeql-action/upload-sarif@{% ifversion actions-node16-action %}v2{% else %}v1{% endif %} +github/codeql-action/upload-sarif@v2 diff --git a/data/reusables/actions/action-download-artifact.md b/data/reusables/actions/action-download-artifact.md index 87dffa23a6..11694395b5 100644 --- a/data/reusables/actions/action-download-artifact.md +++ b/data/reusables/actions/action-download-artifact.md @@ -1 +1 @@ -actions/download-artifact@{% ifversion actions-node16-action %}v3{% else %}v2{% endif %} +actions/download-artifact@v3 diff --git a/data/reusables/actions/action-github-script.md b/data/reusables/actions/action-github-script.md index 5fe7bbd846..0bd588fc4d 100644 --- a/data/reusables/actions/action-github-script.md +++ b/data/reusables/actions/action-github-script.md @@ -1 +1 @@ -actions/github-script@{% ifversion actions-node16-action %}v6{% else %}v5{% endif %} +actions/github-script@v6 diff --git a/data/reusables/actions/action-labeler.md b/data/reusables/actions/action-labeler.md index d466a32276..70949f797c 100644 --- a/data/reusables/actions/action-labeler.md +++ b/data/reusables/actions/action-labeler.md @@ -1 +1 @@ -actions/labeler@{% ifversion actions-node16-action %}v4{% else %}v3{% endif %} +actions/labeler@v4 diff --git a/data/reusables/actions/action-setup-dotnet.md b/data/reusables/actions/action-setup-dotnet.md index 771fbcc57f..036755f229 100644 --- a/data/reusables/actions/action-setup-dotnet.md +++ b/data/reusables/actions/action-setup-dotnet.md @@ -1 +1 @@ -actions/setup-dotnet@{% ifversion actions-node16-action %}v3{% else %}v1{% endif %} +actions/setup-dotnet@v3 diff --git a/data/reusables/actions/action-setup-go.md b/data/reusables/actions/action-setup-go.md index f365f52c60..b196650b2e 100644 --- a/data/reusables/actions/action-setup-go.md +++ b/data/reusables/actions/action-setup-go.md @@ -1 +1 @@ -actions/setup-go@{% ifversion actions-setup-go-default-cache-enabled %}v4{% elsif actions-node16-action %}v3{% else %}v2{% endif %} +actions/setup-go@{% ifversion actions-setup-go-default-cache-enabled %}v4{% else %}v3{% endif %} diff --git a/data/reusables/actions/action-setup-java.md b/data/reusables/actions/action-setup-java.md index c4b149a03f..5e377d2ddf 100644 --- a/data/reusables/actions/action-setup-java.md +++ b/data/reusables/actions/action-setup-java.md @@ -1 +1 @@ -actions/setup-java@{% ifversion actions-node16-action %}v3{% else %}v2{% endif %} +actions/setup-java@v3 diff --git a/data/reusables/actions/action-setup-node.md b/data/reusables/actions/action-setup-node.md index 64420e9c97..bcacc9ab32 100644 --- a/data/reusables/actions/action-setup-node.md +++ b/data/reusables/actions/action-setup-node.md @@ -1 +1 @@ -actions/setup-node@{% ifversion actions-node16-action %}v3{% else %}v2{% endif %} +actions/setup-node@v4 diff --git a/data/reusables/actions/action-setup-python.md b/data/reusables/actions/action-setup-python.md index 4ecb2809b1..bc9bbd4c80 100644 --- a/data/reusables/actions/action-setup-python.md +++ b/data/reusables/actions/action-setup-python.md @@ -1 +1 @@ -actions/setup-python@{% ifversion actions-node16-action %}v4{% else %}v2{% endif %} +actions/setup-python@v4 diff --git a/data/reusables/actions/action-stale.md b/data/reusables/actions/action-stale.md index 25ed23c848..36b146e49b 100644 --- a/data/reusables/actions/action-stale.md +++ b/data/reusables/actions/action-stale.md @@ -1 +1 @@ -actions/stale@{% ifversion actions-node16-action %}v5{% else %}v4{% endif %} +actions/stale@v5 diff --git a/data/reusables/actions/action-upload-artifact.md b/data/reusables/actions/action-upload-artifact.md index a2cd588fc4..248c970f06 100644 --- a/data/reusables/actions/action-upload-artifact.md +++ b/data/reusables/actions/action-upload-artifact.md @@ -1 +1 @@ -actions/upload-artifact@{% ifversion actions-node16-action %}v3{% else %}v2{% endif %} +actions/upload-artifact@v3