Skip to content

Commit b4152c7

Browse files
authored
Merge pull request #39179 from github/repo-sync
Repo sync
2 parents 9e599bc + 3b30451 commit b4152c7

8 files changed

+19
-19
lines changed

Diff for: .github/workflows/azure-preview-env-deploy.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ permissions:
4444

4545
# This allows one deploy workflow to interrupt another
4646
concurrency:
47-
group: 'preview-env @ ${{ github.head_ref || github.run_id }} for ${{ github.event.number || github.event.inputs.PR_NUMBER }}'
47+
group: 'preview-env @ ${{ github.head_ref || github.run_id }} for ${{ github.event.number || inputs.PR_NUMBER }}'
4848
cancel-in-progress: true
4949

5050
jobs:
@@ -56,8 +56,8 @@ jobs:
5656
# See https://bit.ly/3qB9nZW > If a job in a workflow is skipped due to a conditional, it will report its status as "Success".
5757
if: |
5858
(
59-
(github.event.pull_request.head.sha || github.event.inputs.COMMIT_REF)
60-
&& (github.event.number || github.event.inputs.PR_NUMBER || github.run_id)
59+
(github.event.pull_request.head.sha || inputs.COMMIT_REF)
60+
&& (github.event.number || inputs.PR_NUMBER || github.run_id)
6161
)
6262
&& (github.repository == 'github/docs-internal' || github.repository == 'github/docs')
6363
&& github.actor != 'dependabot[bot]'
@@ -70,8 +70,8 @@ jobs:
7070
# to link a PR to a list of environments later.
7171
url: ${{ env.APP_URL }}
7272
env:
73-
PR_NUMBER: ${{ github.event.number || github.event.inputs.PR_NUMBER || github.run_id }}
74-
COMMIT_REF: ${{ github.event.pull_request.head.sha || github.event.inputs.COMMIT_REF }}
73+
PR_NUMBER: ${{ github.event.number || inputs.PR_NUMBER || github.run_id }}
74+
COMMIT_REF: ${{ github.event.pull_request.head.sha || inputs.COMMIT_REF }}
7575
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
7676
IS_INTERNAL_BUILD: ${{ github.repository == 'github/docs-internal' }}
7777
# This may also run in forked repositories, not just 'github/docs'

Diff for: .github/workflows/azure-preview-env-destroy.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ permissions:
2121

2222
# This allows one deploy workflow to interrupt another
2323
concurrency:
24-
group: 'preview-env @ ${{ github.head_ref || github.run_id }} for ${{ github.event.number || github.event.inputs.PR_NUMBER }}'
24+
group: 'preview-env @ ${{ github.head_ref || github.run_id }} for ${{ github.event.number || inputs.PR_NUMBER }}'
2525
cancel-in-progress: true
2626

2727
jobs:
@@ -31,7 +31,7 @@ jobs:
3131
if: github.repository == 'github/docs-internal' || github.repository == 'github/docs'
3232
timeout-minutes: 5
3333
env:
34-
PR_NUMBER: ${{ github.event.number || github.event.inputs.PR_NUMBER }}
34+
PR_NUMBER: ${{ github.event.number || inputs.PR_NUMBER }}
3535

3636
steps:
3737
- name: 'Az CLI login'

Diff for: .github/workflows/azure-staging-build-deploy.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ permissions:
2323
# This allows a subsequently queued workflow run to take priority over
2424
# previously queued runs but NOT interrupt currently executing runs
2525
concurrency:
26-
group: 'staging-env @ ${{ github.head_ref || github.run_id }} for ${{ github.event.number || github.event.inputs.PR_NUMBER }}'
26+
group: 'staging-env @ ${{ github.head_ref || github.run_id }} for ${{ github.event.number || inputs.PR_NUMBER }}'
2727
cancel-in-progress: true
2828

2929
jobs:
@@ -36,9 +36,9 @@ jobs:
3636
name: staging-env
3737
url: ${{ env.APP_URL }}
3838
env:
39-
PR_NUMBER: ${{ github.event.number || github.event.inputs.PR_NUMBER || github.run_id }}
40-
COMMIT_REF: ${{ github.event.pull_request.head.sha || github.event.inputs.COMMIT_REF }}
41-
IMAGE_REPO: ${{ github.repository }}/pr-${{ github.event.number || github.event.inputs.PR_NUMBER || github.run_id }}
39+
PR_NUMBER: ${{ github.event.number || inputs.PR_NUMBER || github.run_id }}
40+
COMMIT_REF: ${{ github.event.pull_request.head.sha || inputs.COMMIT_REF }}
41+
IMAGE_REPO: ${{ github.repository }}/pr-${{ github.event.number || inputs.PR_NUMBER || github.run_id }}
4242
RESOURCE_GROUP_NAME: docs-staging
4343
APP_SERVICE_NAME: ghdocs-staging
4444
SLOT_NAME: canary

Diff for: .github/workflows/purge-fastly.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ jobs:
3939
- uses: ./.github/actions/node-npm-setup
4040

4141
- name: Purge Fastly edge cache independent of language
42-
if: ${{ github.event.inputs.nuke_all }}
42+
if: ${{ inputs.nuke_all }}
4343
run: .github/actions-scripts/purge-fastly-edge-cache.js
4444

4545
- name: Purge Fastly edge cache per language
46-
if: ${{ !github.event.inputs.nuke_all }}
46+
if: ${{ !inputs.nuke_all }}
4747
env:
48-
LANGUAGES: ${{ github.event.inputs.languages }}
48+
LANGUAGES: ${{ inputs.languages }}
4949
run: .github/actions-scripts/purge-fastly-edge-cache-per-language.js

Diff for: .github/workflows/sync-codeql-cli.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
token: ${{ secrets.DOCS_BOT_PAT_WRITEORG_PROJECT }}
4747
repository: github/semmle-code
4848
path: semmle-code
49-
ref: ${{ github.event.inputs.SOURCE_BRANCH }}
49+
ref: ${{ inputs.SOURCE_BRANCH }}
5050

5151
- uses: ./.github/actions/node-npm-setup
5252

Diff for: .github/workflows/sync-openapi.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
# will be checked out
4646
repository: github/rest-api-description
4747
path: rest-api-description
48-
ref: ${{ github.event.inputs.SOURCE_BRANCH }}
48+
ref: ${{ inputs.SOURCE_BRANCH }}
4949

5050
- uses: ./.github/actions/node-npm-setup
5151

Diff for: .github/workflows/sync-search-elasticsearch.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ jobs:
166166

167167
# Note that by default, this is '' (empty string) and that means
168168
# the same as not set within the script.
169-
VERSION: ${{ github.event.inputs.version }}
169+
VERSION: ${{ inputs.version }}
170170

171171
# The sync-search-index recognizes this env var if you don't
172172
# use the `--popular-pags <PATH>` option.
@@ -188,7 +188,7 @@ jobs:
188188
# Must match what we used when scraping (npm run sync-search-indices)
189189
# otherwise the script will seek other versions from disk that might
190190
# not exist.
191-
VERSION: ${{ github.event.inputs.version }}
191+
VERSION: ${{ inputs.version }}
192192
run: |
193193
./src/search/scripts/index-elasticsearch.js /tmp/records \
194194
--language ${{ matrix.language }} \

Diff for: data/reusables/actions/jobs/section-choosing-the-runner-for-a-job.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Use `jobs.<job_id>.runs-on` to define the type of machine to run the job on.
3232

3333
jobs:
3434
test:
35-
runs-on: [self-hosted, "${{ github.event.inputs.chosen-os }}"]
35+
runs-on: [self-hosted, "${{ inputs.chosen-os }}"]
3636
steps:
3737
- run: echo Hello world!
3838
```

0 commit comments

Comments
 (0)