Skip to content

Commit ac3d59a

Browse files
OctomergerdihydroJenoxidegithub-actionsfelicitymayrachmari
authored
repo sync (github#16442)
* Updated language to reference enabling instead of opt-in * Optimize images * fixing broken link * Update content/get-started/privacy-on-github/about-githubs-use-of-your-data.md Co-authored-by: Felicity Chapman <[email protected]> * Update content/get-started/privacy-on-github/managing-data-use-settings-for-your-private-repository.md Co-authored-by: Felicity Chapman <[email protected]> * Update content/get-started/privacy-on-github/managing-data-use-settings-for-your-private-repository.md Co-authored-by: Felicity Chapman <[email protected]> * Openapi update api.github.com (github#26398) * Openapi 3.0 ghae (github#26400) * Update OpenAPI Descriptions (github#26397) * Fix a change missed in a last minute update (github#26389) * change order of some site-policy docs (github#26307) * reordering the docs * Create codespace.md * Update README.md * Update README.md * Update codespace.md * Update codespace.md * Update codespace.md * Update codespace.md * Update OpenAPI Descriptions * update preview env app_url to preview.ghdocs.com (github#26335) * Fix flag (github#26420) * Update codespace.md * Update codespace.md * Update codespace.md * Remove Caddy from preview envs (github#26336) * remove caddy from preview envs * fix: remove location from template Co-authored-by: Peter Bengtsson <[email protected]> * Add `Ignore commits in the blame view` to blame docs (github#26017) * Connect addendum deprecation (github#26296) * temporarily commented out * also comment out * also comment out Co-authored-by: Jenni Christensen <[email protected]> Co-authored-by: github-actions <[email protected]> Co-authored-by: Felicity Chapman <[email protected]> Co-authored-by: Rachael Sewell <[email protected]> Co-authored-by: github-openapi-bot <[email protected]> Co-authored-by: Abby Vollmer <[email protected]> Co-authored-by: hubwriter <[email protected]> Co-authored-by: docubot <[email protected]> Co-authored-by: Mike Surowiec <[email protected]> Co-authored-by: Matt Pollard <[email protected]> Co-authored-by: Peter Bengtsson <[email protected]> Co-authored-by: Jason Etcovitch <[email protected]> Co-authored-by: Billy Rusteen <[email protected]>
1 parent 04f9e9e commit ac3d59a

File tree

34 files changed

+1337614
-858407
lines changed

34 files changed

+1337614
-858407
lines changed

.github/actions-scripts/get-preview-app-info.sh

+1-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
[[ -z $APP_NAME_SEED ]] && { echo "Missing APP_NAME_SEED. Exiting."; exit 1; }
1414

1515
PREVIEW_ENV_LOCATION="eastus"
16-
echo "PREVIEW_ENV_LOCATION=${PREVIEW_ENV_LOCATION}" >> $GITHUB_ENV
1716

1817
REPO_NAME="${GITHUB_REPOSITORY#*\/}"
1918
echo "REPO_NAME=${REPO_NAME}" >> $GITHUB_ENV
@@ -22,15 +21,14 @@ DEPLOYMENT_NAME="${REPO_NAME}-pr-${PR_NUMBER}"
2221
echo "DEPLOYMENT_NAME=${DEPLOYMENT_NAME}" >> $GITHUB_ENV
2322

2423
APP_NAME_BASE="${REPO_NAME}-preview-${PR_NUMBER}"
25-
echo "APP_NAME_BASE=${APP_NAME_BASE}" >> $GITHUB_ENV
2624

2725
# pseudo random string so guessing a preview env URL is more difficult
2826
APP_SHA=$(echo -n "${APP_NAME_SEED}-${APP_NAME_BASE}" | sha1sum | cut -c1-6)
2927

3028
APP_NAME="${APP_NAME_BASE}-${APP_SHA}"
3129
echo "APP_NAME=${APP_NAME}" >> $GITHUB_ENV
3230

33-
APP_URL="https://${APP_NAME}.${PREVIEW_ENV_LOCATION}.azurecontainer.io"
31+
APP_URL="https://${REPO_NAME}-${PR_NUMBER}-${APP_SHA}.preview.ghdocs.com"
3432
echo "APP_URL=${APP_URL}" >> $GITHUB_ENV
3533

3634
IMAGE_REPO="${GITHUB_REPOSITORY}/pr-${PR_NUMBER}"

.github/workflows/azure-preview-env-deploy.yml

-3
Original file line numberDiff line numberDiff line change
@@ -203,13 +203,10 @@ jobs:
203203
template: ./azure-preview-env-template.json
204204
deploymentName: ${{ env.DEPLOYMENT_NAME }}
205205
parameters: appName="${{ env.APP_NAME }}"
206-
location="${{ env.PREVIEW_ENV_LOCATION }}"
207206
containerImage="${{ env.DOCKER_IMAGE }}"
208207
dockerRegistryUrl="${{ secrets.NONPROD_REGISTRY_SERVER }}"
209208
dockerRegistryUsername="${{ secrets.NONPROD_REGISTRY_USERNAME }}"
210209
dockerRegistryPassword="${{ secrets.NONPROD_REGISTRY_PASSWORD }}"
211-
storageAccountName="${{ secrets.AZURE_STORAGE_ACCOUNT_NAME }}"
212-
storageAccountKey="${{ secrets.AZURE_STORAGE_ACCOUNT_KEY }}"
213210
# this shows warnings in the github actions console, because the flag is passed through a validation run,
214211
# but it *is* functional during the actual execution
215212
additionalArguments: --no-wait

.github/workflows/test.yml

+15-16
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,14 @@ jobs:
3131
fail-fast: false
3232
matrix:
3333
# The same array lives in test-windows.yml, so make any updates there too.
34-
test-group:
35-
[
34+
test-group: [
3635
content,
3736
graphql,
3837
meta,
3938
rendering,
4039
routing,
4140
unit,
42-
linting,
41+
# linting,
4342
translations,
4443
]
4544
steps:
@@ -102,20 +101,20 @@ jobs:
102101
- name: Checkout LFS objects
103102
run: git lfs checkout
104103

105-
- name: Gather files changed
106-
uses: trilom/file-changes-action@a6ca26c14274c33b15e6499323aac178af06ad4b
107-
id: get_diff_files
108-
with:
109-
# So that `steps.get_diff_files.outputs.files` becomes
110-
# a string like `foo.js path/bar.md`
111-
output: ' '
104+
# - name: Gather files changed
105+
# uses: trilom/file-changes-action@a6ca26c14274c33b15e6499323aac178af06ad4b
106+
# id: get_diff_files
107+
# with:
108+
# # So that `steps.get_diff_files.outputs.files` becomes
109+
# # a string like `foo.js path/bar.md`
110+
# output: ' '
112111

113-
- name: Insight into changed files
114-
run: |
112+
# - name: Insight into changed files
113+
# run: |
115114

116-
# Must to do this because the list of files can be HUGE. Especially
117-
# in a repo-sync when there are lots of translation files involved.
118-
echo "${{ steps.get_diff_files.outputs.files }}" > get_diff_files.txt
115+
# # Must to do this because the list of files can be HUGE. Especially
116+
# # in a repo-sync when there are lots of translation files involved.
117+
# echo "${{ steps.get_diff_files.outputs.files }}" > get_diff_files.txt
119118

120119
- name: Setup node
121120
uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561
@@ -137,6 +136,6 @@ jobs:
137136

138137
- name: Run tests
139138
env:
140-
DIFF_FILE: get_diff_files.txt
139+
# DIFF_FILE: get_diff_files.txt
141140
CHANGELOG_CACHE_FILE_PATH: tests/fixtures/changelog-feed.json
142141
run: npm test -- tests/${{ matrix.test-group }}/
Loading
Loading

azure-preview-env-template.json

-64
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
"description": "A unique name for the app"
1212
}
1313
},
14-
"location": {
15-
"type": "String"
16-
},
1714
"containerImage": {
1815
"type": "string",
1916
"defaultValue": null,
@@ -32,12 +29,6 @@
3229
},
3330
"dockerRegistryPassword": {
3431
"type": "SecureString"
35-
},
36-
"storageAccountName": {
37-
"type": "String"
38-
},
39-
"storageAccountKey": {
40-
"type": "SecureString"
4132
}
4233
},
4334
"resources": [
@@ -83,53 +74,6 @@
8374
}
8475
}
8576
}
86-
},
87-
{
88-
"name": "caddy-ssl-server",
89-
"properties": {
90-
"image": "caddy:2.4.6",
91-
"command": [
92-
"caddy",
93-
"reverse-proxy",
94-
"--from",
95-
"[concat(parameters('appName'), '.', parameters('location'), '.azurecontainer.io')]",
96-
"--to",
97-
"localhost:4000"
98-
],
99-
"ports": [
100-
{
101-
"protocol": "TCP",
102-
"port": 443
103-
},
104-
{
105-
"protocol": "TCP",
106-
"port": 80
107-
}
108-
],
109-
"environmentVariables": [],
110-
"resources": {
111-
"requests": {
112-
"memoryInGB": 1,
113-
"cpu": 1
114-
}
115-
},
116-
"volumeMounts": [
117-
{
118-
"name": "caddy-data",
119-
"mountPath": "/data"
120-
}
121-
]
122-
}
123-
}
124-
],
125-
"volumes": [
126-
{
127-
"name": "caddy-data",
128-
"azureFile": {
129-
"shareName": "caddy",
130-
"storageAccountName": "[parameters('storageAccountName')]",
131-
"storageAccountKey": "[parameters('storageAccountKey')]"
132-
}
13377
}
13478
],
13579
"imageRegistryCredentials": [
@@ -142,17 +86,9 @@
14286
"restartPolicy": "Always",
14387
"ipAddress": {
14488
"ports": [
145-
{
146-
"protocol": "TCP",
147-
"port": 443
148-
},
14989
{
15090
"protocol": "TCP",
15191
"port": 4000
152-
},
153-
{
154-
"protocol": "TCP",
155-
"port": 80
15692
}
15793
],
15894
"type": "Public",

content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/about-your-personal-dashboard.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ You'll see updates in your news feed when a user you follow:
6565
- Forks a public repository.{% endif %}
6666
- Publishes a new release.
6767

68-
For more information about starring repositories and following people, see "[Following people](/articles/following-people)" and "[Be social](/get-started/quickstart/be-social)."
68+
For more information about following people and watching repositories, see "[Following people](/get-started/exploring-projects-on-github/following-people)" and "[Be social](/get-started/quickstart/be-social)."
6969

7070
{% if for-you-feed %}
7171
### For you feed

content/get-started/privacy-on-github/about-githubs-use-of-your-data.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ shortTitle: GitHub's use of your data
1616

1717
## About {% data variables.product.product_name %}'s use of your data
1818

19-
{% data variables.product.product_name %} aggregates metadata and parses content patterns for the purposes of delivering generalized insights within the product. It uses data from public repositories, and also uses metadata and aggregate data from private repositories when a repository's owner has chosen to share the data with {% data variables.product.product_name %} through an opt-in. If you opt a private repository into data use, then it will perform read-only analysis of that specific private repository.
19+
{% data variables.product.product_name %} aggregates metadata and parses content patterns for the purposes of delivering generalized insights within the product. It uses data from public repositories, and also uses metadata and aggregate data from private repositories when a repository's owner has chosen to share the data with {% data variables.product.product_name %} by enabling the dependency graph. If you enable the dependency graph for a private repository, then {% data variables.product.product_name %} will perform read-only analysis of that specific private repository.
20+
21+
If you enable data use for a private repository, we will continue to treat your private data, source code, or trade secrets as confidential and private consistent with our [Terms of Service](/free-pro-team@latest/github/site-policy/github-terms-of-service). The information we learn only comes from aggregated data. For more information, see "[Managing data use settings for your private repository](/get-started/privacy-on-github/managing-data-use-settings-for-your-private-repository)."
2022

2123
{% data reusables.repositories.about-github-archive-program %} For more information, see "[About archiving content and data on {% data variables.product.prodname_dotcom %}](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program)."
2224

2325
{% data reusables.user-settings.export-data %} For more information, see "[Requesting an archive of your personal account's data](/articles/requesting-an-archive-of-your-personal-account-s-data)."
2426

25-
If you opt in to data use for a private repository, we will continue to treat your private data, source code, or trade secrets as confidential and private consistent with our [Terms of Service](/free-pro-team@latest/github/site-policy/github-terms-of-service). The information we learn only comes from aggregated data. For more information, see "[Managing data use settings for your private repository](/get-started/privacy-on-github/managing-data-use-settings-for-your-private-repository)."
26-
2727
We'll announce substantial new features that use metadata or aggregate data on the [{% data variables.product.prodname_dotcom %} blog](https://github.com/blog).
2828

2929
## How data improves security recommendations

content/get-started/privacy-on-github/managing-data-use-settings-for-your-private-repository.md

+14-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,22 @@ shortTitle: Manage data use for private repo
1616

1717
## About data use for your private repository
1818

19+
20+
You can control data use for your private repository with the security and analysis features.
21+
22+
- Enable the dependency graph to allow read-only data analysis on your repository.
23+
- Disable the dependency graph to block read-only data analysis of your repository.
24+
1925
When you enable data use for your private repository, you'll be able to access the dependency graph, where you can track your repository's dependencies and receive {% data variables.product.prodname_dependabot_alerts %} when {% data variables.product.product_name %} detects vulnerable dependencies. For more information, see "[About {% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies#dependabot-alerts-for-vulnerable-dependencies)."
2026

21-
## Enabling or disabling data use features
27+
28+
{% note %}
29+
30+
**Note:** If you disable the dependency graph, {% data variables.product.prodname_dependabot_alerts %} and {% data variables.product.prodname_dependabot_security_updates %} are also disabled. For more information, see "[About the dependency graph](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph)."
31+
32+
{% endnote %}
33+
34+
## Enabling or disabling data use through security and analysis features
2235

2336
{% data reusables.security.security-and-analysis-features-enable-read-only %}
2437

0 commit comments

Comments
 (0)