Skip to content

Commit 574f9c2

Browse files
authored
Merge branch 'main' into main
2 parents 5b61e7c + bf4d8b2 commit 574f9c2

File tree

8 files changed

+70
-49
lines changed

8 files changed

+70
-49
lines changed

.github/workflows/js-lint.yml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Lint JS
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- main
8+
pull_request:
9+
branches-ignore:
10+
- translations
11+
12+
jobs:
13+
see_if_should_skip:
14+
runs-on: ubuntu-latest
15+
16+
outputs:
17+
should_skip: ${{ steps.skip_check.outputs.should_skip }}
18+
steps:
19+
- id: skip_check
20+
uses: fkirc/skip-duplicate-actions@36feb0d8d062137530c2e00bd278d138fe191289
21+
with:
22+
cancel_others: 'false'
23+
github_token: ${{ github.token }}
24+
paths: '["**/*.js", "package*.json", ".github/workflows/js-lint.yml"]'
25+
26+
lint:
27+
runs-on: ubuntu-latest
28+
needs: see_if_should_skip
29+
if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
30+
steps:
31+
- name: Check out repo
32+
uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675
33+
34+
- name: Setup node
35+
uses: actions/setup-node@56899e050abffc08c2b3b61f3ec6a79a9dc3223d
36+
with:
37+
node-version: 14.x
38+
39+
- name: Get npm cache directory
40+
id: npm-cache
41+
run: |
42+
echo "::set-output name=dir::$(npm config get cache)"
43+
44+
- name: Cache node modules
45+
uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16
46+
with:
47+
path: ${{ steps.npm-cache.outputs.dir }}
48+
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
49+
restore-keys: |
50+
${{ runner.os }}-node-
51+
52+
- name: Install dependencies
53+
run: npm ci
54+
55+
- name: Run linter
56+
run: npx standard
57+
58+
- name: Check dependencies
59+
run: npm run check-deps

.github/workflows/test.yml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -28,48 +28,7 @@ jobs:
2828
cancel_others: 'false'
2929
github_token: ${{ github.token }}
3030
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"]'
31-
lint:
32-
needs: see_if_should_skip
33-
runs-on: ubuntu-latest
34-
steps:
35-
# Each of these ifs needs to be repeated at each step to make sure the required check still runs
36-
# Even if if doesn't do anything
37-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
38-
name: Check out repo
39-
uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675
40-
41-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
42-
name: Setup node
43-
uses: actions/setup-node@56899e050abffc08c2b3b61f3ec6a79a9dc3223d
44-
with:
45-
node-version: 14.x
46-
47-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
48-
name: Get npm cache directory
49-
id: npm-cache
50-
run: |
51-
echo "::set-output name=dir::$(npm config get cache)"
52-
53-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
54-
name: Cache node modules
55-
uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16
56-
with:
57-
path: ${{ steps.npm-cache.outputs.dir }}
58-
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
59-
restore-keys: |
60-
${{ runner.os }}-node-
6131

62-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
63-
name: Install dependencies
64-
run: npm ci
65-
66-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
67-
name: Run linter
68-
run: npx standard
69-
70-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
71-
name: Check dependencies
72-
run: npm run check-deps
7332
test:
7433
needs: see_if_should_skip
7534
runs-on: ubuntu-latest

.github/workflows/triage-issue-comments.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
triage-issue-comments:
8-
if: github.repository == 'github/docs'
8+
if: github.repository == 'github/docs' && github.event.issue.pull_request == null
99
runs-on: ubuntu-latest
1010

1111
steps:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ If you've found a problem, you can open an issue using a [template](https://gith
2727

2828
#### Solve an issue
2929

30-
If you have a solution to one of the open issues, you will need to fork the repository and submit a PR using the [template](https://github.com/github/docs/blob/main/CONTRIBUTING.md#pull-request-template) that is visible automatically in the pull request body. For more details about this process, please check out [Getting Started with Contributing](/CONTRIBUTING.md).
30+
If you have a solution to one of the open issues, you will need to fork the repository and submit a PR using the [template](https://github.com/github/docs/blob/main/CONTRIBUTING.md#pull-request-template) that is visible automatically in the pull request body. For more details about this process, please check out [Getting Started with Contributing](/CONTRIBUTING.md).
3131

3232
#### Join us in discussions
3333

content/actions/learn-github-actions/managing-complex-workflows.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@ This example action demonstrates how to reference an existing secret as an envir
2424
```yaml
2525
jobs:
2626
example-job:
27+
runs-on: ubuntu-latest
2728
steps:
2829
- name: Retrieve secret
2930
env:
3031
super_secret: ${{ secrets.SUPERSECRET }}
3132
run: |
32-
example-command "$SUPER_SECRET"
33+
example-command "$super_secret"
3334
```
3435
{% endraw %}
3536
@@ -49,6 +50,7 @@ jobs:
4950
- run: ./setup_server.sh
5051
build:
5152
needs: setup
53+
runs-on: ubuntu-latest
5254
steps:
5355
- run: ./build_server.sh
5456
test:
@@ -141,7 +143,7 @@ This example shows how a workflow can use labels to specify the required runner:
141143
```yaml
142144
jobs:
143145
example-job:
144-
runs-on: [self-hosted, linux, x64, gpu]
146+
runs-on: [self-hosted, linux, x64, gpu]
145147
```
146148

147149
For more information, see ["Using labels with self-hosted runners](/actions/hosting-your-own-runners/using-labels-with-self-hosted-runners)."

content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ Custom filters do not currently support:
8282
- Distinguishing between the `is:issue`, `is:pr`, and `is:pull-request` query filters. These queries will return both issues and pull requests.
8383
- Creating more than 15 custom filters.
8484
- Changing the default filters or their order.
85+
- Search [exclusion](/github/searching-for-information-on-github/understanding-the-search-syntax#exclude-certain-results) using `NOT` or `-QUALIFIER`.
8586

8687
### Supported queries for custom filters
8788

content/packages/publishing-and-managing-packages/about-github-packages.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ For more information about the container support offered by {% data variables.pr
8585
#### Support for package registries
8686

8787
{% if currentVersion == "free-pro-team@latest" %}
88-
Package registries use `PACKAGE-TYPE.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` as the package host URL, replacing `PACKAGE-TYPE` with the Package namespace. For example, your Gemfile will be hosted at `rubygem.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME`.
88+
Package registries use `PACKAGE-TYPE.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` as the package host URL, replacing `PACKAGE-TYPE` with the Package namespace. For example, your Gemfile will be hosted at `rubygems.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME`.
8989

9090
{% else %}
9191

@@ -103,8 +103,8 @@ If {% data variables.product.product_location %} has subdomain isolation disable
103103
| --- | --- | --- | --- | --- |
104104
| JavaScript | Node package manager | `package.json` | `npm` | `npm.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME`
105105
| Ruby | RubyGems package manager | `Gemfile` | `gem` | `rubygems.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME`
106-
| Java | Apache Maven project management and comprehension tool | `pom.xml` | `mvn` | `maven.HOSTNAME/OWNER/REPOSITORY/IMAGE-NAME`
107-
| Java | Gradle build automation tool for Java | `build.gradle` or `build.gradle.kts` | `gradle` | `maven.HOSTNAME/OWNER/REPOSITORY/IMAGE-NAME`
106+
| Java | Apache Maven project management and comprehension tool | `pom.xml` | `mvn` | `maven.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME`
107+
| Java | Gradle build automation tool for Java | `build.gradle` or `build.gradle.kts` | `gradle` | `maven.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME`
108108
| .NET | NuGet package management for .NET | `nupkg` | `dotnet` CLI | `nuget.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME`
109109

110110
{% else %}

includes/header.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ <h4 class="text-mono f5 text-normal text-gray d-md-none">{% data ui.homepage.exp
104104

105105
<!-- GitHub.com homepage and 404 page has a stylized search; Enterprise homepages do not -->
106106
{% if page.relativePath != 'index.md' and error != '404' %}
107-
<div class="pt-3 pt-md-0 d-md-inline-block ml-md-3 bord'er-top border-md-top-0">
107+
<div class="pt-3 pt-md-0 d-md-inline-block ml-md-3 border-top border-md-top-0">
108108
{% include search-form %}
109109
<div id="search-results-container"></div>
110110
<div class="search-overlay-desktop"></div>

0 commit comments

Comments
 (0)