Skip to content

Commit 71ad067

Browse files
hubwritersubatoi
andauthored
Remove redundant versioning (#55511)
Co-authored-by: Ben Ahmady <32935794+subatoi@users.noreply.github.com>
1 parent 61201b3 commit 71ad067

File tree

6 files changed

+11
-113
lines changed

6 files changed

+11
-113
lines changed

content/actions/sharing-automations/sharing-actions-and-workflows-with-your-organization.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ redirect_from:
1212
- /actions/creating-actions/sharing-actions-and-workflows-with-your-organization
1313
---
1414

15-
## About {% data variables.product.prodname_actions %} access to private {% ifversion ghec or ghes %} or internal {% endif %}repositories
15+
## About {% data variables.product.prodname_actions %} access to private repositories
1616

1717
You can share actions and reusable workflows within your organization, without publishing them publicly, by allowing {% data variables.product.prodname_actions %} workflows to access a private repository that contains the action or reusable workflow.
1818

@@ -24,7 +24,7 @@ Any actions or reusable workflows stored in the private repository can be used i
2424
2525
## Sharing actions and workflows with your organization
2626

27-
1. Store the action or reusable workflow in a private {% ifversion ghec or ghes %} or internal {% endif %}repository. For more information, see [AUTOTITLE](/repositories/creating-and-managing-repositories/about-repositories#about-repository-visibility).
27+
1. Store the action or reusable workflow in a private repository. For more information, see [AUTOTITLE](/repositories/creating-and-managing-repositories/about-repositories#about-repository-visibility).
2828
1. Configure the repository to allow access to workflows in other private repositories. For more information, see [AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository#allowing-access-to-components-in-a-private-repository).
2929

3030
## Further reading

content/copilot/customizing-copilot/managing-copilot-knowledge-bases.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@ redirect_from:
2020
- /copilot/github-copilot-enterprise/copilot-docset-management/about-copilot-docset-management
2121
---
2222

23-
{% ifversion fpt %}
24-
25-
{% data reusables.rai.copilot.enterprise-fpt-link %}
26-
27-
{% endif %}
28-
2923
## About knowledge bases
3024

3125
Organization owners can create knowledge bases, bringing together Markdown documentation across one or more repositories. Organization members can then specify that knowledge base as the context for {% data variables.product.prodname_copilot_chat_dotcom_short %}, {% data variables.product.prodname_copilot_chat_short %} in {% data variables.product.prodname_vscode %}, and {% data variables.product.prodname_copilot_chat_short %} in {% data variables.product.prodname_vs %}.

content/graphql/overview/changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ autogenerated: graphql
1212

1313
Breaking changes include changes that will break existing queries or could affect the runtime behavior of clients. For a list of breaking changes and when they will occur, see our [breaking changes log](/graphql/overview/breaking-changes).
1414

15-
<!-- Content after this section is automatically generated -->
15+
<!-- Content after this section is automatically generated -->

content/migrations/importing-source-code/using-the-command-line-to-import-source-code/importing-from-other-version-control-systems-with-the-administrative-shell.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,5 +93,4 @@ permissions: Site administrators can use the administrative shell to import data
9393

9494
## Further reading
9595

96-
* [AUTOTITLE](/admin/configuration/configuring-your-enterprise/command-line-utilities#import-and-export){% ifversion fpt or ghec %}
97-
* [AUTOTITLE](/get-started/using-git/troubleshooting-the-2-gb-push-limit){% endif %}
96+
* [AUTOTITLE](/admin/configuration/configuring-your-enterprise/command-line-utilities#import-and-export)

content/packages/working-with-a-github-packages-registry/working-with-the-docker-registry.md

Lines changed: 6 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -50,28 +50,16 @@ You can authenticate to {% data variables.product.prodname_registry %} with Dock
5050

5151
To keep your credentials secure, we recommend you save your {% data variables.product.pat_generic %} in a local file on your computer and use Docker's `--password-stdin` flag, which reads your token from a local file.
5252

53-
{% ifversion fpt or ghec %}
54-
{% raw %}
55-
56-
```shell
57-
cat ~/TOKEN.txt | docker login https://docker.pkg.github.com -u USERNAME --password-stdin
58-
```
59-
60-
{% endraw %}
61-
{% endif %}
62-
63-
{% ifversion ghes %}
64-
{% ifversion ghes %}
6553
If your instance has subdomain isolation enabled:
66-
{% endif %}
54+
6755
{% raw %}
6856

6957
```shell
7058
cat ~/TOKEN.txt | docker login docker.HOSTNAME -u USERNAME --password-stdin
7159
```
7260

7361
{% endraw %}
74-
{% ifversion ghes %}
62+
7563
If your instance has subdomain isolation disabled:
7664

7765
{% raw %}
@@ -81,11 +69,8 @@ cat ~/TOKEN.txt | docker login HOSTNAME -u USERNAME --password-stdin
8169
```
8270

8371
{% endraw %}
84-
{% endif %}
8572

86-
{% endif %}
87-
88-
To use this example login command, replace `USERNAME` with your {% data variables.product.github %} username{% ifversion ghes %}, `HOSTNAME` with the URL for {% data variables.location.product_location %},{% endif %} and `~/TOKEN.txt` with the file path to your {% data variables.product.pat_generic %} for {% data variables.product.github %}.
73+
To use this example login command, replace `USERNAME` with your {% data variables.product.github %} username, `HOSTNAME` with the URL for {% data variables.location.product_location %}, and `~/TOKEN.txt` with the file path to your {% data variables.product.pat_generic %} for {% data variables.product.github %}.
8974

9075
For more information, see [Docker login](https://docs.docker.com/engine/reference/commandline/login/#provide-a-password-using-stdin).
9176

@@ -109,110 +94,61 @@ For more information, see [Docker login](https://docs.docker.com/engine/referenc
10994
> IMAGE_NAME VERSION IMAGE_ID 4 weeks ago 1.11MB
11095
```
11196

112-
1. Using the Docker image ID, tag the docker image, replacing OWNER with the name of the personal account or organization that owns the repository, REPOSITORY with the name of the repository containing your project, IMAGE_NAME with name of the package or image,{% ifversion ghes %} HOSTNAME with the hostname of {% data variables.location.product_location %},{% endif %} and VERSION with package version at build time.
113-
{% ifversion fpt or ghec %}
97+
1. Using the Docker image ID, tag the Docker image, replacing OWNER with the name of the personal account or organization that owns the repository, REPOSITORY with the name of the repository containing your project, IMAGE_NAME with name of the package or image, HOSTNAME with the hostname of {% data variables.location.product_location %}, and VERSION with package version at build time.
11498

11599
```shell
116100
docker tag IMAGE_ID docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION
117101
```
118102

119-
{% else %}
120-
{% ifversion ghes %}
121103
If your instance has subdomain isolation enabled:
122-
{% endif %}
123104

124105
```shell
125106
docker tag IMAGE_ID docker.HOSTNAME/OWNER/REPOSITORY/IMAGE_NAME:VERSION
126107
```
127108

128-
{% ifversion ghes %}
129109
If your instance has subdomain isolation disabled:
130110

131111
```shell
132112
docker tag IMAGE_ID HOSTNAME/OWNER/REPOSITORY/IMAGE_NAME:VERSION
133113
```
134114

135-
{% endif %}
136-
{% endif %}
137-
1. If you haven't already built a docker image for the package, build the image, replacing OWNER with the name of the personal account or organization that owns the repository, REPOSITORY with the name of the repository containing your project, IMAGE_NAME with name of the package or image, VERSION with package version at build time,{% ifversion ghes %} HOSTNAME with the hostname of {% data variables.location.product_location %},{% endif %} and PATH to the image if it isn't in the current working directory.
138-
{% ifversion fpt or ghec %}
139-
140-
```shell
141-
docker build -t docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION PATH
142-
```
115+
1. If you haven't already built a Docker image for the package, build the image, replacing OWNER with the name of the personal account or organization that owns the repository, REPOSITORY with the name of the repository containing your project, IMAGE_NAME with name of the package or image, VERSION with package version at build time, HOSTNAME with the hostname of {% data variables.location.product_location %}, and PATH to the image if it isn't in the current working directory.
143116

144-
{% else %}
145-
{% ifversion ghes %}
146117
If your instance has subdomain isolation enabled:
147-
{% endif %}
148118

149119
```shell
150120
docker build -t docker.HOSTNAME/OWNER/REPOSITORY/IMAGE_NAME:VERSION PATH
151121
```
152122

153-
{% ifversion ghes %}
154123
If your instance has subdomain isolation disabled:
155124

156125
```shell
157126
docker build -t HOSTNAME/OWNER/REPOSITORY/IMAGE_NAME:VERSION PATH
158127
```
159128

160-
{% endif %}
161-
{% endif %}
162129
1. Publish the image to {% data variables.product.prodname_registry %}.
163-
{% ifversion fpt or ghec %}
164-
165-
```shell
166-
docker push docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION
167-
```
168130

169-
{% else %}
170-
{% ifversion ghes %}
171131
If your instance has subdomain isolation enabled:
172-
{% endif %}
173132

174133
```shell
175134
docker push docker.HOSTNAME/OWNER/REPOSITORY/IMAGE_NAME:VERSION
176135
```
177136

178-
{% ifversion ghes %}
179137
If your instance has subdomain isolation disabled:
180138

181139
```shell
182140
docker push HOSTNAME/OWNER/REPOSITORY/IMAGE_NAME:VERSION
183141
```
184142

185-
{% endif %}
186-
{% endif %}
187-
188143
> [!NOTE]
189144
> You must push your image using `IMAGE_NAME:VERSION` and not using `IMAGE_NAME:SHA`.
190145
191146
### Example publishing a Docker image
192147

193-
{% ifversion ghes %}
194148
These examples assume your instance has subdomain isolation enabled.
195-
{% endif %}
196149

197150
You can publish version 1.0 of the `monalisa` image to the `octocat/octo-app` repository using an image ID.
198151

199-
{% ifversion fpt or ghec %}
200-
201-
```shell
202-
$ docker images
203-
204-
> REPOSITORY TAG IMAGE ID CREATED SIZE
205-
> monalisa 1.0 c75bebcdd211 4 weeks ago 1.11MB
206-
207-
# Tag the image with OWNER/REPO/IMAGE_NAME
208-
$ docker tag c75bebcdd211 docker.pkg.github.com/octocat/octo-app/monalisa:1.0
209-
210-
# Push the image to {% data variables.product.prodname_registry %}
211-
$ docker push docker.pkg.github.com/octocat/octo-app/monalisa:1.0
212-
```
213-
214-
{% else %}
215-
216152
```shell
217153
$ docker images
218154

@@ -226,23 +162,8 @@ $ docker tag c75bebcdd211 docker.HOSTNAME/octocat/octo-app/monalisa:1.0
226162
$ docker push docker.HOSTNAME/octocat/octo-app/monalisa:1.0
227163
```
228164

229-
{% endif %}
230-
231165
You can publish a new Docker image for the first time and name it `monalisa`.
232166

233-
{% ifversion fpt or ghec %}
234-
235-
```shell
236-
# Build the image with docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION
237-
# Assumes Dockerfile resides in the current working directory (.)
238-
$ docker build -t docker.pkg.github.com/octocat/octo-app/monalisa:1.0 .
239-
240-
# Push the image to {% data variables.product.prodname_registry %}
241-
$ docker push docker.pkg.github.com/octocat/octo-app/monalisa:1.0
242-
```
243-
244-
{% else %}
245-
246167
```shell
247168
# Build the image with docker.HOSTNAME/OWNER/REPOSITORY/IMAGE_NAME:VERSION
248169
# Assumes Dockerfile resides in the current working directory (.)
@@ -252,40 +173,24 @@ $ docker build -t docker.HOSTNAME/octocat/octo-app/monalisa:1.0 .
252173
$ docker push docker.HOSTNAME/octocat/octo-app/monalisa:1.0
253174
```
254175

255-
{% endif %}
256-
257176
## Downloading an image
258177

259178
{% data reusables.package_registry.docker_registry_deprecation_status %}
260179

261-
You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing OWNER with the name of the personal account or organization that owns the repository, REPOSITORY with the name of the repository containing your project, IMAGE_NAME with name of the package or image,{% ifversion ghes %} HOSTNAME with the host name of {% data variables.location.product_location %}, {% endif %} and TAG_NAME with tag for the image you want to install.
180+
You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing OWNER with the name of the personal account or organization that owns the repository, REPOSITORY with the name of the repository containing your project, IMAGE_NAME with name of the package or image, HOSTNAME with the host name of {% data variables.location.product_location %}, and TAG_NAME with tag for the image you want to install.
262181

263-
{% ifversion fpt or ghec %}
264-
265-
```shell
266-
docker pull docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:TAG_NAME
267-
```
268-
269-
{% else %}
270-
<!--Versioning out this "subdomain isolation enabled" line because it's the only option for GHES 2.22 so it can be misleading.-->
271-
{% ifversion ghes %}
272182
If your instance has subdomain isolation enabled:
273-
{% endif %}
274183

275184
```shell
276185
docker pull docker.HOSTNAME/OWNER/REPOSITORY/IMAGE_NAME:TAG_NAME
277186
```
278187

279-
{% ifversion ghes %}
280188
If your instance has subdomain isolation disabled:
281189

282190
```shell
283191
docker pull HOSTNAME/OWNER/REPOSITORY/IMAGE_NAME:TAG_NAME
284192
```
285193

286-
{% endif %}
287-
{% endif %}
288-
289194
> [!NOTE]
290195
> You must pull the image using `IMAGE_NAME:VERSION` and not using `IMAGE_NAME:SHA`.
291196

content/site-policy/github-terms/github-terms-for-additional-products-and-features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ To use GitHub Copilot in your code editor, you need to install the GitHub Copilo
108108

109109
If you customize GitHub Copilot, to include using a GitHub Copilot Extension (Extension), your use may be subject to the terms of use and privacy policy applicable to the customization.
110110

111-
The code you write using GitHub Copilot is not “Content” under the Agreement until you upload it to GitHub.com{% ifversion ghec %} or GHE.com{% endif %}. The code, functions, and other output returned to you by GitHub Copilot are called “**Suggestions**.” GitHub does not own Suggestions. You retain ownership of Your Code and you retain responsibility for Suggestions you include in Your Code. It is entirely your decision whether to use Suggestions generated by GitHub Copilot. If you use Suggestions, GitHub strongly recommends that you have reasonable policies and practices in place designed to prevent the use of a Suggestion in a way that may violate the rights of others.
111+
The code you write using GitHub Copilot is not “Content” under the Agreement until you upload it to GitHub.com. The code, functions, and other output returned to you by GitHub Copilot are called “**Suggestions**.” GitHub does not own Suggestions. You retain ownership of Your Code and you retain responsibility for Suggestions you include in Your Code. It is entirely your decision whether to use Suggestions generated by GitHub Copilot. If you use Suggestions, GitHub strongly recommends that you have reasonable policies and practices in place designed to prevent the use of a Suggestion in a way that may violate the rights of others.
112112

113113
_Acceptable Use_
114114

0 commit comments

Comments
 (0)