Skip to content

Commit 33355c8

Browse files
authored
Merge branch 'main' into patch-2
2 parents c2369ad + 6e29d1c commit 33355c8

168 files changed

Lines changed: 2480 additions & 1395 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.

.devcontainer/devcontainer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,16 @@
2121
"davidanson.vscode-markdownlint",
2222
"bierner.markdown-preview-github-styles",
2323
"yzhang.markdown-all-in-one",
24-
"streetsidesoftware.code-spell-checker"
24+
"streetsidesoftware.code-spell-checker",
25+
"hubwriter.open-reusable"
2526
],
2627

2728
// Use 'forwardPorts' to make a list of ports inside the container available locally.
2829
"forwardPorts": [4000],
2930

3031
// Use 'postCreateCommand' to run commands after the container is created.
31-
"postCreateCommand": "npm ci && npm run build",
32-
32+
"postCreateCommand": "npm ci && npm run build",
33+
3334
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
3435
"remoteUser": "node"
3536
}

.github/actions-scripts/fr-add-docs-reviewers-requests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ async function run() {
120120
const featureID = findFieldID('Feature', data)
121121
const contributorTypeID = findFieldID('Contributor type', data)
122122
const sizeTypeID = findFieldID('Size', data)
123-
const authorID = findFieldID('Author', data)
123+
const authorID = findFieldID('Contributor', data)
124124

125125
// Get the ID of the single select values that we want to set
126126
const readyForReviewID = findSingleSelectID('Ready for review', 'Status', data)

.github/actions-scripts/ready-for-docs-review.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ async function run() {
6060
const featureID = findFieldID('Feature', data)
6161
const contributorTypeID = findFieldID('Contributor type', data)
6262
const sizeTypeID = findFieldID('Size', data)
63-
const authorID = findFieldID('Author', data)
63+
const authorID = findFieldID('Contributor', data)
6464

6565
// Get the ID of the single select values that we want to set
6666
const readyForReviewID = findSingleSelectID('Ready for review', 'Status', data)

.vscode/open-reusable-1.3.0.vsix

236 KB
Binary file not shown.

.vscode/settings.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
"files.exclude": {
33
"**/translations": true
44
}
5-
}
5+
"workbench.editor.enablePreview": false,
6+
"workbench.editor.enablePreviewFromQuickOpen": false
7+
}
22.6 KB
Loading
122 KB
Loading
110 KB
Loading

content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-google-cloud-platform.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ This example has a job called `Get_OIDC_ID_token` that uses actions to request a
7070

7171
This action exchanges a {% data variables.product.prodname_dotcom %} OIDC token for a Google Cloud access token, using [Workload Identity Federation](https://cloud.google.com/iam/docs/workload-identity-federation).
7272

73+
{% raw %}
7374
```yaml{:copy}
7475
name: List services in GCP
7576
on:
@@ -97,3 +98,4 @@ jobs:
9798
gcloud auth login --brief --cred-file="${{ steps.auth.outputs.credentials_file_path }}"
9899
gcloud config list
99100
```
101+
{% endraw %}

content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/setting-up-dependabot-updates.md

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@ When you have configured {% data variables.product.product_location %} to use {%
4848
Any VM that you use for {% data variables.product.prodname_dependabot %} runners must meet the requirements for self-hosted runners. In addition, they must meet the following requirements.
4949

5050
- Linux operating system
51-
- The following dependencies installed:
52-
- Docker running as the same user as the self-hosted runner application
53-
- Git
51+
- Git installed
52+
- Docker installed with access for the runner users:
53+
- We recommend installing Docker in rootless mode and configuring the runners to access Docker without `root` privileges.
54+
- Alternatively, install Docker and give the runner users raised privileges to run Docker.
5455

5556
The CPU and memory requirements will depend on the number of concurrent runners you deploy on a given VM. As guidance, we have successfully set up 20 runners on a single 2 CPU 8GB machine, but ultimately, your CPU and memory requirements will heavily depend on the repositories being updated. Some ecosystems will require more resources than others.
5657

@@ -72,6 +73,15 @@ If you specify more than 14 concurrent runners on a VM, you must also update the
7273

7374
1. Provision self-hosted runners, at the repository, organization, or enterprise account level. For more information, see "[About self-hosted runners](/actions/hosting-your-own-runners/about-self-hosted-runners)" and "[Adding self-hosted runners](/actions/hosting-your-own-runners/adding-self-hosted-runners)."
7475

75-
2. Verify that the self-hosted runners meet the requirements for {% data variables.product.prodname_dependabot %} before assigning a `dependabot` label to each runner you want {% data variables.product.prodname_dependabot %} to use. For more information, see "[Using labels with self-hosted runners](/actions/hosting-your-own-runners/using-labels-with-self-hosted-runners#assigning-a-label-to-a-self-hosted-runner)."
76+
2. Set up the self-hosted runners with the requirements described above. For example, on a VM running Ubuntu 20.04 you would:
7677

77-
3. Optionally, enable workflows triggered by {% data variables.product.prodname_dependabot %} to use more than read-only permissions and to have access to any secrets that are normally available. For more information, see "[Troubleshooting {% data variables.product.prodname_actions %} for your enterprise](/admin/github-actions/advanced-configuration-and-troubleshooting/troubleshooting-github-actions-for-your-enterprise#enabling-workflows-triggered-by-dependabot-access-to-dependabot-secrets-and-increased-permissions)."
78+
- Verify that Git is installed: `command -v git`
79+
- Install Docker and ensure that the runner users have access to Docker. For more information, see the Docker documentation.
80+
- [Install Docker Engine on Ubuntu](https://docs.docker.com/engine/install/ubuntu/)
81+
- Recommended approach: [Run the Docker daemon as a non-root user (Rootless mode)](https://docs.docker.com/engine/security/rootless/)
82+
- Alternative approach: [Manage Docker as a non-root user](https://docs.docker.com/engine/install/linux-postinstall/#manage-docker-as-a-non-root-user)
83+
- Verify that the runners have access to the public internet and can only access the internal networks that {% data variables.product.prodname_dependabot %} needs.
84+
85+
3. Assign a `dependabot` label to each runner you want {% data variables.product.prodname_dependabot %} to use. For more information, see "[Using labels with self-hosted runners](/actions/hosting-your-own-runners/using-labels-with-self-hosted-runners#assigning-a-label-to-a-self-hosted-runner)."
86+
87+
4. Optionally, enable workflows triggered by {% data variables.product.prodname_dependabot %} to use more than read-only permissions and to have access to any secrets that are normally available. For more information, see "[Troubleshooting {% data variables.product.prodname_actions %} for your enterprise](/admin/github-actions/advanced-configuration-and-troubleshooting/troubleshooting-github-actions-for-your-enterprise#enabling-workflows-triggered-by-dependabot-access-to-dependabot-secrets-and-increased-permissions)."

0 commit comments

Comments
 (0)