Skip to content

Commit be8179c

Browse files
authored
Merge branch 'main' into repository-https
2 parents 7c69169 + ba6bf09 commit be8179c

80 files changed

Lines changed: 1090 additions & 453 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.

.env.example

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
ALGOLIA_API_KEY=
22
ALGOLIA_APPLICATION_ID=
33
ALLOW_TRANSLATION_COMMITS=
4-
EARLY_ACCESS_HOSTNAME=
5-
EARLY_ACCESS_SHARED_SECRET=
6-
GITHUB_TOKEN=

.github/ISSUE_TEMPLATE/improve-existing-docs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ labels:
77
assignees: ''
88
---
99
<!--
10-
HUBBERS BEWARE! THE GITHUB/DOCS REPO IS PUBLIC TO THE ENTIRE INTERNET. OPEN AN ISSUE IN GITHUB/DOCS-CONTENT https://github.com/github/docs-content/issues/new/choose INSTEAD.
10+
HUBBERS BEWARE! THE GITHUB/DOCS REPO IS PUBLIC TO THE ENTIRE INTERNET. OPEN AN ISSUE IN GITHUB/DOCS-CONTENT INSTEAD.
1111
-->
1212

1313
<!--
1414
For questions, ask in Discussions: https://github.com/github/docs/discussions
1515
16-
Before you file an issue read the:
16+
Before you file an issue read the:
1717
- Code of Conduct: https://github.com/github/docs/blob/main/CODE_OF_CONDUCT.md
1818
- Contributing guide: https://github.com/github/docs/blob/main/CONTRIBUTING.md
1919

.github/ISSUE_TEMPLATE/improve-the-site.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ assignees: ''
77
---
88

99
<!--
10-
HUBBERS BEWARE! THE GITHUB/DOCS REPO IS PUBLIC TO THE ENTIRE INTERNET. OPEN AN ISSUE IN GITHUB/DOCS-CONTENT https://github.com/github/docs-content/issues/new/choose INSTEAD.
10+
HUBBERS BEWARE! THE GITHUB/DOCS REPO IS PUBLIC TO THE ENTIRE INTERNET. OPEN AN ISSUE IN GITHUB/DOCS-CONTENT INSTEAD.
1111
-->
1212

1313
<!--
1414
For questions, ask in Discussions: https://github.com/github/docs/discussions
1515
16-
Before you file an issue read the:
16+
Before you file an issue read the:
1717
- Code of Conduct: https://github.com/github/docs/blob/main/CODE_OF_CONDUCT.md
1818
- Contributing guide: https://github.com/github/docs/blob/main/CONTRIBUTING.md
1919
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Close unwanted pull requests
2+
on:
3+
pull_request:
4+
paths:
5+
- '.github/workflows/**'
6+
- '.github/CODEOWNERS'
7+
- 'translations/**'
8+
- 'assets/fonts/**'
9+
- 'data/graphql/**'
10+
- 'lib/graphql/**'
11+
- 'lib/redirects/**'
12+
- 'lib/webhooks/**'
13+
jobs:
14+
close_unwanted_pull_requests:
15+
if: github.repository == 'github/docs' && github.event.pull_request.user.login != 'Octomerger'
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9
19+
with:
20+
script: |
21+
await github.issues.createComment({
22+
...context.repo,
23+
issue_number: context.payload.pull_request.number,
24+
body:
25+
`Thanks for contributing! We do not accept community changes to these files at this time.
26+
- '.github/workflows/**'
27+
- '.github/CODEOWNERS'
28+
- 'translations/**'
29+
- 'assets/fonts/**'
30+
- 'data/graphql/**'
31+
- 'lib/graphql/**'
32+
- 'lib/redirects/**'
33+
- 'lib/webhooks/**'`
34+
})
35+
await github.issues.update({
36+
...context.repo,
37+
issue_number: context.payload.pull_request.number,
38+
state: 'closed'
39+
})

.github/workflows/sync-algolia-search-indices.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ jobs:
3737
if: failure()
3838
env:
3939
SLACK_WEBHOOK: ${{ secrets.DOCS_ALERTS_SLACK_WEBHOOK }}
40-
SLACK_MESSAGE: The last Algolia workflow run for ${{github.repository}} failed. See https://github.com/github/docs-internal/actions?query=workflow%3AAlgolia
40+
SLACK_MESSAGE: The last Algolia workflow run for ${{github.repository}} failed. Search actions for `workflow:Algolia`

.github/workflows/test.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
with:
2828
cancel_others: 'false'
2929
github_token: ${{ github.token }}
30-
paths: '[".github/workflows/test.yml",".node-version", ".npmrc", "app.json", "content/**", "data/**","lib/**", "Dockerfile", "feature-flags.json", "Gemfile", "Gemfile.lock", "middleware/**", "node_modules/**","package.json", "package-lock.json", "server.js", "tests/**", "translations/**", "Procfile", "webpack.config.js"]'
30+
paths: '[".github/workflows/test.yml", ".node-version", ".npmrc", "app.json", "content/**", "data/**","lib/**", "Dockerfile", "feature-flags.json", "Gemfile", "Gemfile.lock", "middleware/**", "node_modules/**","package.json", "package-lock.json", "server.js", "tests/**", "translations/**", "Procfile", "webpack.config.js"]'
3131

3232
test:
3333
needs: see_if_should_skip
@@ -44,6 +44,9 @@ jobs:
4444
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
4545
name: Check out repo
4646
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
47+
with:
48+
# Enables cloning the Early Access repo later with the relevant PAT
49+
persist-credentials: 'false'
4750

4851
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
4952
name: Setup node
@@ -70,19 +73,19 @@ jobs:
7073
name: Install dependencies
7174
run: npm ci
7275

73-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
74-
name: Run build script
76+
- name: Clone early access
77+
if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' && github.repository == 'github/docs-internal' }}
78+
run: npm run heroku-postbuild
79+
env:
80+
DOCUBOT_REPO_PAT: ${{ secrets.DOCUBOT_REPO_PAT }}
81+
GIT_BRANCH: ${{ github.ref }}
82+
83+
- name: Run build script
84+
if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' && github.repository != 'github/docs-internal' }}
7585
run: npm run build
7686

7787
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
7888
name: Run tests
7989
run: npx jest tests/${{ matrix.test-group }}/
8090
env:
8191
NODE_OPTIONS: '--max_old_space_size=4096'
82-
83-
- name: Send Slack notification if workflow fails
84-
uses: rtCamp/action-slack-notify@e17352feaf9aee300bf0ebc1dfbf467d80438815
85-
if: failure() && github.ref == 'early-access'
86-
env:
87-
SLACK_WEBHOOK: ${{ secrets.DOCS_ALERTS_SLACK_WEBHOOK }}
88-
SLACK_MESSAGE: 'Tests are failing on the `early-access` branch. https://github.com/github/docs-internal/tree/early-access'

.gitignore

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
.algolia-cache
22
.DS_Store
33
.env
4-
node_modules
4+
/node_modules/
55
npm-debug.log
6-
coverage
6+
coverage/
77
.linkinator
8-
broken_links.md
8+
/assets/images/early-access
9+
/content/early-access
10+
/data/early-access
911
dist
12+
13+
# blc: broken link checker
14+
blc_output.log
15+
blc_output_internal.log
16+
/dist/
17+
broken_links.md

assets/images/octicons/README.md

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +0,0 @@
1-
## Importing Aftermarket Octicons
2-
3-
#### Background
4-
Some octicons are missing from the project's current version of the `octicons` gem. Because this project is being replaced soon and updating `octicons` would require [significant changes](https://github.com/github/docs-internal/issues/6250#issuecomment-339730405), new octicons should be added manually as needed, via the following process:
5-
6-
#### How to add
7-
8-
1. Locate the missing octicon `.svg` in [primer/octions](https://github.com/primer/octicons/tree/master/lib/svg) and download it to your local `app/assets/images/octions` folder
9-
1. Add a line to `app/assets/stylesheets/shared/_octicons.scss` for the new octicon, like so:
10-
```apple css
11-
.octicon-<YOUR OCTICON NAME>:before {
12-
content: url("#{$new-octicons-path}/<YOUR OCTICON FILENAME>.svg")
13-
}
14-
```
15-
16-
You may now use the new octicon in your content as normal! :tada:

content/actions/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ changelog:
3737
- title: Self-Hosted Runner Group Access Changes
3838
date: '2020-10-16'
3939
href: https://github.blog/changelog/2020-10-16-github-actions-self-hosted-runner-group-access-changes/
40+
41+
product_video: https://www.youtube-nocookie.com/embed/cP0I9w2coGU
4042

4143
redirect_from:
4244
- /articles/automating-your-workflow-with-github-actions/

content/github/creating-cloning-and-archiving-repositories/https-cloning-errors.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,16 @@ typing `git remote -v`:
4646
```shell
4747
$ git remote -v
4848
# View existing remotes
49-
> origin https://github.com/github/reactivecocoa.git (fetch)
50-
> origin https://github.com/github/reactivecocoa.git (push)
49+
> origin https://github.com/ghost/reactivecocoa.git (fetch)
50+
> origin https://github.com/ghost/reactivecocoa.git (push)
5151

52-
$ git remote set-url origin https://github.com/github/ReactiveCocoa.git
52+
$ git remote set-url origin https://github.com/ghost/ReactiveCocoa.git
5353
# Change the 'origin' remote's URL
5454

5555
$ git remote -v
5656
# Verify new remote URL
57-
> origin https://github.com/github/ReactiveCocoa.git (fetch)
58-
> origin https://github.com/github/ReactiveCocoa.git (push)
57+
> origin https://github.com/ghost/ReactiveCocoa.git (fetch)
58+
> origin https://github.com/ghost/ReactiveCocoa.git (push)
5959
```
6060
6161
Alternatively, you can change the URL through our
@@ -73,7 +73,7 @@ When prompted for a username and password, make sure you use an account that has
7373
7474
{% tip %}
7575
76-
**Tip**: If you don't want to enter your credentials every time you interact with the remote repository, you can turn on [credential caching](/github/using-git/caching-your-github-credentials-in-git). If you are already using credential caching, please make sure that your computer has the correct credentials cached. Incorrect or out of date credentials will cause authentication to fail.
76+
**Tip**: If you don't want to enter your credentials every time you interact with the remote repository, you can turn on [credential caching](/github/using-git/caching-your-github-credentials-in-git). If you are already using credential caching, please make sure that your computer has the correct credentials cached. Incorrect or out of date credentials will cause authentication to fail.
7777
7878
{% endtip %}
7979

0 commit comments

Comments
 (0)