Skip to content

Commit 9c1566e

Browse files
authored
Merge pull request #34745 from github/repo-sync
Repo sync
2 parents 1c4431d + e340726 commit 9c1566e

File tree

35 files changed

+43
-199
lines changed

35 files changed

+43
-199
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,14 +216,10 @@ Untrusted workflows running on your self-hosted runner pose significant security
216216

217217
For more information about security hardening for self-hosted runners, see "[AUTOTITLE](/actions/security-guides/security-hardening-for-github-actions#hardening-for-self-hosted-runners)."
218218

219-
{% ifversion actions-disable-repo-runners %}
220-
221219
### Restricting the use of self-hosted runners
222220

223221
{% data reusables.actions.disable-selfhosted-runners-crossrefs %}
224222

225-
{% endif %}
226-
227223
{% ifversion ghec or ghes %}
228224

229225
## Further reading

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,12 @@ You can add self-hosted runners to a single repository. To add a self-hosted run
4949

5050
For information about how to add a self-hosted runner with the REST API, see "[AUTOTITLE](/rest/actions/self-hosted-runners)."
5151

52-
{% ifversion actions-disable-repo-runners %}
53-
5452
{% note %}
5553

5654
**Note**: {% data reusables.actions.disable-selfhosted-runners-crossrefs %}
5755

5856
{% endnote %}
5957

60-
{% endif %}
61-
6258
{% data reusables.repositories.navigate-to-repo %}
6359
{% data reusables.repositories.sidebar-settings %}
6460
{% data reusables.repositories.settings-sidebar-actions-runners %}

content/actions/hosting-your-own-runners/managing-self-hosted-runners/monitoring-and-troubleshooting-self-hosted-runners.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,12 @@ shortTitle: Monitor & troubleshoot
1717

1818
{% data reusables.actions.enterprise-github-hosted-runners %}
1919

20-
{% ifversion actions-disable-repo-runners %}
21-
2220
## Using repository-level self-hosted runners
2321

2422
You may not be able to create a self-hosted runner for an organization-owned repository.
2523

2624
{% data reusables.actions.disable-selfhosted-runners-crossrefs %}
2725

28-
{% endif %}
29-
3026
## Checking the status of a self-hosted runner
3127

3228
{% data reusables.actions.self-hosted-runner-management-permissions-required %}

content/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/approving-workflow-runs-from-private-forks.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ title: Approving workflow runs from private forks
33
intro: 'When someone without write access submits a pull request to a private repository, a maintainer may need to approve any workflow runs.'
44
permissions: Maintainers with write access to a repository can approve workflow runs.
55
versions:
6-
feature: actions-private-fork-workflow-approvals
6+
fpt: '*'
7+
ghec: '*'
8+
ghes: '*'
79
shortTitle: Approve private fork runs
810
redirect_from:
911
- /actions/managing-workflow-runs/approving-workflow-runs-from-private-forks

content/actions/migrating-to-github-actions/manually-migrating-to-github-actions/migrating-from-circleci-to-github-actions.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ For more information, see "[AUTOTITLE](/actions/learn-github-actions/variables#d
7272

7373
CircleCI and {% data variables.product.prodname_actions %} provide a method to manually cache files in the configuration file.
7474

75-
{% ifversion actions-caching %}
76-
7775
Below is an example of the syntax for each system.
7876

7977
### CircleCI syntax for caching
@@ -100,12 +98,6 @@ Below is an example of the syntax for each system.
10098
restore-keys: v1-npm-deps-
10199
```
102100
103-
{% else %}
104-
105-
{% data reusables.actions.caching-availability %}
106-
107-
{% endif %}
108-
109101
{% data variables.product.prodname_actions %} does not have an equivalent of CircleCI’s Docker Layer Caching (or DLC).
110102
111103
## Persisting data between jobs

content/actions/migrating-to-github-actions/manually-migrating-to-github-actions/migrating-from-gitlab-cicd-to-github-actions.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,6 @@ For more information, see "[AUTOTITLE](/actions/learn-github-actions/variables)"
270270

271271
GitLab CI/CD and {% data variables.product.prodname_actions %} provide a method in the configuration file to manually cache workflow files.
272272

273-
{% ifversion actions-caching %}
274-
275273
Below is an example of the syntax for each system.
276274

277275
### GitLab CI/CD syntax for caching
@@ -311,12 +309,6 @@ jobs:
311309
restore-keys: v1-npm-deps-
312310
```
313311

314-
{% else %}
315-
316-
{% data reusables.actions.caching-availability %}
317-
318-
{% endif %}
319-
320312
## Artifacts
321313

322314
Both GitLab CI/CD and {% data variables.product.prodname_actions %} can upload files and directories created by a job as artifacts. In {% data variables.product.prodname_actions %}, artifacts can be used to persist data across multiple jobs.

content/actions/migrating-to-github-actions/manually-migrating-to-github-actions/migrating-from-travis-ci-to-github-actions.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,6 @@ jobs:
270270

271271
Travis CI and {% data variables.product.prodname_actions %} let you manually cache dependencies for later reuse.
272272

273-
{% ifversion actions-caching %}
274-
275273
These examples demonstrate the cache syntax for each system.
276274

277275
### Travis CI syntax for caching
@@ -296,12 +294,6 @@ cache: npm
296294
restore-keys: v1-npm-deps-
297295
```
298296

299-
{% else %}
300-
301-
{% data reusables.actions.caching-availability %}
302-
303-
{% endif %}
304-
305297
## Examples of common tasks
306298

307299
This section compares how {% data variables.product.prodname_actions %} and Travis CI perform common tasks.

content/actions/security-for-github-actions/security-guides/security-hardening-for-github-actions.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,12 +337,8 @@ For third-party images, such as the images for ARM-powered runners, you can find
337337

338338
{% ifversion fpt or ghec %}As a result, self-hosted runners should almost [never be used for public repositories](/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners#self-hosted-runner-security) on {% data variables.product.product_name %}, because any user can open pull requests against the repository and compromise the environment. Similarly, be{% elsif ghes %}Be{% endif %} cautious when using self-hosted runners on private or internal repositories, as anyone who can fork the repository and open a pull request (generally those with read access to the repository) are able to compromise the self-hosted runner environment, including gaining access to secrets and the `GITHUB_TOKEN` which, depending on its settings, can grant write access to the repository. Although workflows can control access to environment secrets by using environments and required reviews, these workflows are not run in an isolated environment and are still susceptible to the same risks when run on a self-hosted runner.
339339

340-
{% ifversion actions-disable-repo-runners %}
341-
342340
{% data reusables.actions.disable-selfhosted-runners-crossrefs %}
343341

344-
{% endif %}
345-
346342
When a self-hosted runner is defined at the organization or enterprise level, {% data variables.product.product_name %} can schedule workflows from multiple repositories onto the same runner. Consequently, a security compromise of these environments can result in a wide impact. To help reduce the scope of a compromise, you can create boundaries by organizing your self-hosted runners into separate groups. You can restrict what {% ifversion restrict-groups-to-workflows %}workflows, {% endif %}organizations and repositories can access runner groups. For more information, see "[AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/managing-access-to-self-hosted-runners-using-groups)."
347343

348344
You should also consider the environment of the self-hosted runner machines:

content/actions/use-cases-and-examples/building-and-testing/building-and-testing-go.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,6 @@ You can use `go get` to install dependencies:
146146
go get example.com/[email protected]
147147
```
148148

149-
{% ifversion actions-caching %}
150-
151149
### Caching dependencies
152150

153151
You can cache and restore dependencies using the [`setup-go` action](https://github.com/actions/setup-go). By default, caching is {% ifversion actions-setup-go-default-cache-enabled %}enabled when using the `setup-go` action.{% else %}disabled, but you can set the `cache` parameter to `true` to enable it.{% endif %}
@@ -191,8 +189,6 @@ Alternatively, you can use the `cache-dependency-path` parameter for cases when
191189

192190
If you have a custom requirement or need finer controls for caching, you can use the [`cache` action](https://github.com/marketplace/actions/cache). For more information, see "[AUTOTITLE](/actions/using-workflows/caching-dependencies-to-speed-up-workflows)."
193191

194-
{% endif %}
195-
196192
## Building and testing your code
197193

198194
You can use the same commands that you use locally to build and test your code. This example workflow demonstrates how to use `go build` and `go test` in a job:

content/actions/use-cases-and-examples/building-and-testing/building-and-testing-java-with-gradle.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ shortTitle: Build & test Java & Gradle
2121

2222
## Introduction
2323

24-
This guide shows you how to create a workflow that performs continuous integration (CI) for your Java project using the Gradle build system. The workflow you create will allow you to see when commits to a pull request cause build or test failures against your default branch; this approach can help ensure that your code is always healthy. You can extend your CI workflow to {% ifversion actions-caching %}cache files and{% endif %} upload artifacts from a workflow run.
24+
This guide shows you how to create a workflow that performs continuous integration (CI) for your Java project using the Gradle build system. The workflow you create will allow you to see when commits to a pull request cause build or test failures against your default branch; this approach can help ensure that your code is always healthy. You can extend your CI workflow to cache files and upload artifacts from a workflow run.
2525

2626
{% data variables.product.prodname_dotcom %}-hosted runners have a tools cache with pre-installed software, which includes Java Development Kits (JDKs) and Gradle. For a list of software and the pre-installed versions for JDK and Gradle, see "[AUTOTITLE](/actions/using-github-hosted-runners/about-github-hosted-runners#supported-software)".
2727

@@ -120,16 +120,12 @@ steps:
120120
run: ./gradlew -b ci.gradle package
121121
```
122122

123-
{% ifversion actions-caching %}
124-
125123
## Caching dependencies
126124

127125
Your build dependencies can be cached to speed up your workflow runs. After a successful run, `gradle/actions/setup-gradle` caches important parts of the Gradle user home directory. In future jobs, the cache will be restored so that build scripts won't need to be recompiled and dependencies won't need to be downloaded from remote package repositories.
128126

129127
Caching is enabled by default when using the `gradle/actions/setup-gradle` action. For more information, see [`gradle/actions/setup-gradle`](https://github.com/gradle/actions/blob/main/setup-gradle/README.md#caching-build-state-between-jobs).
130128

131-
{% endif %}
132-
133129
## Packaging workflow data as artifacts
134130

135131
After your build has succeeded and your tests have passed, you may want to upload the resulting Java packages as a build artifact. This will store the built packages as part of the workflow run, and allow you to download them. Artifacts can help you test and debug pull requests in your local environment before they're merged. For more information, see "[AUTOTITLE](/actions/using-workflows/storing-workflow-data-as-artifacts)."

0 commit comments

Comments
 (0)