Skip to content

Commit d31987b

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/minimist-1.2.6
2 parents f4ffd37 + 6dfa8ca commit d31987b

File tree

35 files changed

+108
-116
lines changed

35 files changed

+108
-116
lines changed

.devcontainer/devcontainer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111

1212
// Set *default* container specific settings.json values on container create.
13-
"settings": {
13+
"settings": {
1414
"terminal.integrated.shell.linux": "/bin/bash",
1515
"cSpell.language": ",en"
1616
},
@@ -34,8 +34,8 @@
3434
"forwardPorts": [4000],
3535

3636
// Use 'postCreateCommand' to run commands after the container is created.
37-
"postCreateCommand": "npm ci && npm run build",
38-
37+
"postCreateCommand": "git lfs pull && npm ci",
38+
3939
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
4040
"remoteUser": "node"
4141

.github/workflows/main-preview-docker-cache.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ concurrency:
2020

2121
jobs:
2222
build-and-push-nonprod-cache:
23+
if: ${{ github.repository == 'github/docs-internal' || github.repository == 'github/docs' }}
2324
runs-on: ubuntu-latest
2425
timeout-minutes: 15
2526
env:

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,14 @@ jobs:
7777
env:
7878
VERSION: ${{ github.event.inputs.version }}
7979
LANGUAGE: ${{ github.event.inputs.language }}
80+
# If a reusable, or anything in the `data/*` directory is deleted
81+
# you might get a
82+
#
83+
# RenderError: Can't find the key 'site.data.reusables...' in the scope
84+
#
85+
# But that'll get fixed in the next translation pipeline. For now,
86+
# let's just accept an empty string instead.
87+
THROW_ON_EMPTY: false
8088
run: npm run sync-search
8189

8290
- name: Update private docs repository search indexes
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)