Skip to content

Commit 8e967e2

Browse files
committed
Merge branch 'main' of github.com:github/docs-internal into remove-fpt
2 parents a6c4878 + 3b57913 commit 8e967e2

5 files changed

Lines changed: 7 additions & 12 deletions

File tree

.github/workflows/repo-sync-stalls.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ jobs:
5858
channel: ${{ secrets.DOCS_ALERTS_SLACK_CHANNEL_ID }}
5959
bot-token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }}
6060
color: failure
61-
text: Repo sync appears to be stalled for ${{github.repository}}. See https://github.com/${{github.repository}}/pulls?q=is%3Apr+is%3Aopen+repo+sync
61+
text: Repo sync appears to be stalled for ${{github.repository}}. See https://github.com/${{github.repository}}/pulls?q=is%3Apr+is%3Aopen+label%3Aautomated-reposync-pr

content/actions/learn-github-actions/finding-and-customizing-actions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ steps:
7979
8080
#### Using branches
8181
82-
Referring to a specific branch means that the action will always use the latest updates on the target branch, but can create problems if those updates include breaking changes. This example targets a branch named `@main`:
82+
Specifying a target branch for the action means it will always run the version currently on that branch. This approach can create problems if an update to the branch includes breaking changes. This example targets a branch named `@main`:
8383

8484
```yaml
8585
steps:

content/packages/guides/connecting-a-repository-to-a-container-image.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ https://github.com/monalisa/hello_docker
3333
1. In your Dockerfile, add this line, replacing `OWNER` and `REPO` with your details:
3434

3535
```shell
36-
LABEL org.opencontainers.image.source https://github.com/<em>OWNER</em>/<em>REPO</em>
36+
LABEL org.opencontainers.image.source=https://github.com/<em>OWNER</em>/<em>REPO</em>
3737
```
3838
For example, if you're the user `monalisa` and own `my-repo`, you would add this line to your Dockerfile:
3939
```shell
40-
LABEL org.opencontainers.image.source https://github.com/monalisa/my-repo
40+
LABEL org.opencontainers.image.source=https://github.com/monalisa/my-repo
4141
```
4242
For more information, see "[LABEL](https://docs.docker.com/engine/reference/builder/#label)" in the official Docker documentation and "[Pre-defined Annotation Keys](https://github.com/opencontainers/image-spec/blob/master/annotations.md#pre-defined-annotation-keys)" in the `opencontainers/image-spec` repository.
4343

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
You can require that members use SSH certificates to access organization resources,, unless SSH is disabled in your repository.
1+
You can require that members use SSH certificates to access organization resources, unless SSH is disabled in your repository.

script/purge-redis-pages.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
//
99
// [end-readme]
1010

11-
const program = require('commander')
1211
const Redis = require('ioredis')
1312

1413
const { REDIS_URL, HEROKU_RELEASE_VERSION, HEROKU_PRODUCTION_APP } = process.env
@@ -21,12 +20,8 @@ const startTime = Date.now()
2120
const expirationDuration = 30 * 60 * 1000 // 30 minutes
2221
const expirationTimestamp = startTime + expirationDuration // 30 minutes from now
2322

24-
program
25-
.description('Purge the Redis rendered page cache')
26-
.option('-d, --dry-run', 'print keys to be purged without actually purging')
27-
.parse(process.argv)
28-
29-
const dryRun = program.dryRun
23+
// print keys to be purged without actually purging
24+
const dryRun = ['-d', '--dry-run'].includes(process.argv[2])
3025

3126
// verify environment variables
3227
if (!REDIS_URL) {

0 commit comments

Comments
 (0)