Skip to content

Commit a51872d

Browse files
lecoursenjmarlena
lecoursen
and
jmarlena
authored
Change != "free-pro-team@latest" to enterpriseServerVersions contains currentVersion, actually (github#16114)
* Run script/new-versioning/update-not-fpt-conditionals.js * Fix a few things * Remove outdated versioning * Fix broken link Co-authored-by: jmarlena <6732600+jmarlena@users.noreply.github.com>
1 parent b3d62c0 commit a51872d

111 files changed

Lines changed: 194 additions & 195 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎content/actions/creating-actions/creating-a-javascript-action.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,4 +267,4 @@ From your repository, click the **Actions** tab, and select the latest workflow
267267
![A screenshot of using your action in a workflow](/assets/images/help/repository/javascript-action-workflow-run-updated.png)
268268
{% else %}
269269
![A screenshot of using your action in a workflow](/assets/images/help/repository/javascript-action-workflow-run.png)
270-
{% endif %}
270+
{% endif %}

‎content/actions/hosting-your-own-runners/about-self-hosted-runners.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ The following operating systems are supported for the self-hosted runner applica
9191

9292
- macOS 10.13 (High Sierra) or later
9393

94-
{% if currentVersion != "free-pro-team@latest" %}
94+
{% if enterpriseServerVersions contains currentVersion %}
9595

9696
### Supported actions on self-hosted runners
9797

‎content/actions/hosting-your-own-runners/adding-self-hosted-runners.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ You can add self-hosted runners to an enterprise, where they can be assigned to
5050

5151
{% if currentVersion == "free-pro-team@latest" %}
5252
To add a self-hosted runner to an enterprise account, you must be an enterprise owner.
53-
{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%}
53+
{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%}
5454
To add a self-hosted runner at the enterprise level of {% data variables.product.product_location %}, you must be a site administrator.
5555
{% endif %}
5656

5757
{% if currentVersion == "free-pro-team@latest" %}
5858
{% data reusables.enterprise-accounts.access-enterprise %}
59-
{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%}
59+
{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%}
6060
{% data reusables.enterprise_site_admin_settings.access-settings %}
6161
{% data reusables.enterprise_site_admin_settings.business %}
6262
{% endif %}

‎content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ When creating a group, you must choose a policy that grants access to all organi
5656

5757
{% if currentVersion == "free-pro-team@latest" %}
5858
{% data reusables.enterprise-accounts.access-enterprise %}
59-
{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%}
59+
{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%}
6060
{% data reusables.enterprise_site_admin_settings.access-settings %}
6161
{% data reusables.enterprise_site_admin_settings.business %}
6262
{% endif %}

‎content/actions/hosting-your-own-runners/removing-self-hosted-runners.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ To remove a self-hosted runner from an organization, you must be an organization
6262

6363
{% if currentVersion == "free-pro-team@latest" %}
6464
To remove a self-hosted runner from an enterprise account, you must be an enterprise owner. We recommend that you also have access to the self-hosted runner machine.
65-
{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%}
65+
{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%}
6666
To remove a self-hosted runner at the enterprise level of {% data variables.product.product_location %}, you must be a site administrator. We recommend that you also have access to the self-hosted runner machine.
6767
{% endif %}
6868

6969
{% data reusables.github-actions.self-hosted-runner-reusing %}
7070

7171
{% if currentVersion == "free-pro-team@latest" %}
7272
{% data reusables.enterprise-accounts.access-enterprise %}
73-
{% else if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "enterprise-server@2.21"%}
73+
{% else if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21"%}
7474
{% data reusables.enterprise_site_admin_settings.access-settings %}
7575
{% data reusables.enterprise_site_admin_settings.business %}
7676
{% endif %}

‎content/actions/managing-workflow-runs/disabling-and-enabling-a-workflow.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Disabling and enabling a workflow
3-
intro: You can disable and re-enable a workflow using {% data variables.product.prodname_dotcom %} or the REST API.
3+
intro: 'You can disable and re-enable a workflow using {% data variables.product.prodname_dotcom %} or the REST API.'
44
product: '{% data reusables.gated-features.actions %}'
55
versions:
66
free-pro-team: '*'

‎content/actions/managing-workflow-runs/removing-workflow-artifacts.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ You can also define a custom retention period for individual artifacts using the
3939
### Finding the expiration date of an artifact
4040

4141
You can use the API to confirm the date that an artifact is scheduled to be deleted. For more information, see the `expires_at` value returned by "[List artifacts for a repository](/rest/reference/actions#artifacts)."
42-
{% endif %}
42+
{% endif %}

‎content/actions/reference/workflow-syntax-for-github-actions.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ jobs:
946946

947947
#### **`jobs.<job_id>.container.image`**
948948

949-
The Docker image to use as the container to run the action. The value can be the Docker Hub image name or a {% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name.
949+
The Docker image to use as the container to run the action. The value can be the Docker Hub image name or a {% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name.
950950

951951
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}
952952
#### **`jobs.<job_id>.container.credentials`**
@@ -1029,7 +1029,7 @@ services:
10291029

10301030
#### **`jobs.<job_id>.services.<service_id>.image`**
10311031

1032-
The Docker image to use as the service container to run the action. The value can be the Docker Hub image name or a {% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name.
1032+
The Docker image to use as the service container to run the action. The value can be the Docker Hub image name or a {% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.23" %}public{% endif %} registry name.
10331033

10341034
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}
10351035
#### **`jobs.<job_id>.services.<service_id>.credentials`**

‎content/admin/installation/installing-github-enterprise-server-on-google-cloud-platform.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Before launching {% data variables.product.product_location_enterprise %} on Goo
2525
#### Supported machine types
2626

2727
{% data variables.product.prodname_ghe_server %} is supported on the following Google Compute Engine (GCE) machine types. For more information, see [the Google Cloud Platform machine types article](https://cloud.google.com/compute/docs/machine-types).
28-
{% if currentVersion != "free-pro-team@latest" %}
28+
2929
| High-memory |
3030
------------- |
3131
| n1-highmem-4 |
@@ -34,7 +34,6 @@ Before launching {% data variables.product.product_location_enterprise %} on Goo
3434
| n1-highmem-32 |
3535
| n1-highmem-64 |
3636
| n1-highmem-96 |
37-
{% endif %}
3837

3938
#### Recommended machine types
4039

‎content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ When using LDAP or built-in authentication, two-factor authentication is support
1111

1212
{% data reusables.enterprise_user_management.external_auth_disables_2fa %}
1313

14-
For more information, see [this chart on authentication methods that support 2FA](/enterprise/{{ currentVersion }}/user/articles/about-two-factor-authentication/#authentication-methods-that-support-2fa).
14+
For more information, see "[About two-factor authentication](/github/authenticating-to-github/about-two-factor-authentication)."
1515

1616
### Requirements for enforcing two-factor authentication
1717

0 commit comments

Comments
 (0)