Skip to content

Commit 3cc9a09

Browse files
author
Martin Lopes
authored
Merge branch 'main' into patch-2
2 parents 6ac18cb + ab4d585 commit 3cc9a09

File tree

420 files changed

+1339492
-859608
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

420 files changed

+1339492
-859608
lines changed

.devcontainer/devcontainer.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
"cSpell.language": ",en"
1616
},
1717

18+
// Install features. Type 'feature' in the VS Code command palette for a full list.
19+
"features": {
20+
"git-lfs": "latest"
21+
},
22+
1823
// Visual Studio Code extensions which help authoring for docs.github.com.
1924
"extensions": [
2025
"dbaeumer.vscode-eslint",

.github/actions-scripts/get-preview-app-info.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
[[ -z $APP_NAME_SEED ]] && { echo "Missing APP_NAME_SEED. Exiting."; exit 1; }
1414

1515
PREVIEW_ENV_LOCATION="eastus"
16-
echo "PREVIEW_ENV_LOCATION=${PREVIEW_ENV_LOCATION}" >> $GITHUB_ENV
1716

1817
REPO_NAME="${GITHUB_REPOSITORY#*\/}"
1918
echo "REPO_NAME=${REPO_NAME}" >> $GITHUB_ENV
@@ -22,15 +21,14 @@ DEPLOYMENT_NAME="${REPO_NAME}-pr-${PR_NUMBER}"
2221
echo "DEPLOYMENT_NAME=${DEPLOYMENT_NAME}" >> $GITHUB_ENV
2322

2423
APP_NAME_BASE="${REPO_NAME}-preview-${PR_NUMBER}"
25-
echo "APP_NAME_BASE=${APP_NAME_BASE}" >> $GITHUB_ENV
2624

2725
# pseudo random string so guessing a preview env URL is more difficult
2826
APP_SHA=$(echo -n "${APP_NAME_SEED}-${APP_NAME_BASE}" | sha1sum | cut -c1-6)
2927

3028
APP_NAME="${APP_NAME_BASE}-${APP_SHA}"
3129
echo "APP_NAME=${APP_NAME}" >> $GITHUB_ENV
3230

33-
APP_URL="https://${APP_NAME}.${PREVIEW_ENV_LOCATION}.azurecontainer.io"
31+
APP_URL="https://${REPO_NAME}-${PR_NUMBER}-${APP_SHA}.preview.ghdocs.com"
3432
echo "APP_URL=${APP_URL}" >> $GITHUB_ENV
3533

3634
IMAGE_REPO="${GITHUB_REPOSITORY}/pr-${PR_NUMBER}"

.github/workflows/azure-preview-env-deploy.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,13 +203,10 @@ jobs:
203203
template: ./azure-preview-env-template.json
204204
deploymentName: ${{ env.DEPLOYMENT_NAME }}
205205
parameters: appName="${{ env.APP_NAME }}"
206-
location="${{ env.PREVIEW_ENV_LOCATION }}"
207206
containerImage="${{ env.DOCKER_IMAGE }}"
208207
dockerRegistryUrl="${{ secrets.NONPROD_REGISTRY_SERVER }}"
209208
dockerRegistryUsername="${{ secrets.NONPROD_REGISTRY_USERNAME }}"
210209
dockerRegistryPassword="${{ secrets.NONPROD_REGISTRY_PASSWORD }}"
211-
storageAccountName="${{ secrets.AZURE_STORAGE_ACCOUNT_NAME }}"
212-
storageAccountKey="${{ secrets.AZURE_STORAGE_ACCOUNT_KEY }}"
213210
# this shows warnings in the github actions console, because the flag is passed through a validation run,
214211
# but it *is* functional during the actual execution
215212
additionalArguments: --no-wait

.github/workflows/test.yml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,14 @@ jobs:
3131
fail-fast: false
3232
matrix:
3333
# The same array lives in test-windows.yml, so make any updates there too.
34-
test-group:
35-
[
34+
test-group: [
3635
content,
3736
graphql,
3837
meta,
3938
rendering,
4039
routing,
4140
unit,
42-
linting,
41+
# linting,
4342
translations,
4443
]
4544
steps:
@@ -102,20 +101,20 @@ jobs:
102101
- name: Checkout LFS objects
103102
run: git lfs checkout
104103

105-
- name: Gather files changed
106-
uses: trilom/file-changes-action@a6ca26c14274c33b15e6499323aac178af06ad4b
107-
id: get_diff_files
108-
with:
109-
# So that `steps.get_diff_files.outputs.files` becomes
110-
# a string like `foo.js path/bar.md`
111-
output: ' '
104+
# - name: Gather files changed
105+
# uses: trilom/file-changes-action@a6ca26c14274c33b15e6499323aac178af06ad4b
106+
# id: get_diff_files
107+
# with:
108+
# # So that `steps.get_diff_files.outputs.files` becomes
109+
# # a string like `foo.js path/bar.md`
110+
# output: ' '
112111

113-
- name: Insight into changed files
114-
run: |
112+
# - name: Insight into changed files
113+
# run: |
115114

116-
# Must to do this because the list of files can be HUGE. Especially
117-
# in a repo-sync when there are lots of translation files involved.
118-
echo "${{ steps.get_diff_files.outputs.files }}" > get_diff_files.txt
115+
# # Must to do this because the list of files can be HUGE. Especially
116+
# # in a repo-sync when there are lots of translation files involved.
117+
# echo "${{ steps.get_diff_files.outputs.files }}" > get_diff_files.txt
119118

120119
- name: Setup node
121120
uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561
@@ -137,6 +136,6 @@ jobs:
137136

138137
- name: Run tests
139138
env:
140-
DIFF_FILE: get_diff_files.txt
139+
# DIFF_FILE: get_diff_files.txt
141140
CHANGELOG_CACHE_FILE_PATH: tests/fixtures/changelog-feed.json
142141
run: npm test -- tests/${{ matrix.test-group }}/

LICENSE-CODE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2020 GitHub
3+
Copyright 2022 GitHub
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
79.4 KB
Loading
Binary file not shown.
143 KB
Loading
22.9 KB
Loading

azure-preview-env-template.json

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
"description": "A unique name for the app"
1212
}
1313
},
14-
"location": {
15-
"type": "String"
16-
},
1714
"containerImage": {
1815
"type": "string",
1916
"defaultValue": null,
@@ -32,12 +29,6 @@
3229
},
3330
"dockerRegistryPassword": {
3431
"type": "SecureString"
35-
},
36-
"storageAccountName": {
37-
"type": "String"
38-
},
39-
"storageAccountKey": {
40-
"type": "SecureString"
4132
}
4233
},
4334
"resources": [
@@ -83,53 +74,6 @@
8374
}
8475
}
8576
}
86-
},
87-
{
88-
"name": "caddy-ssl-server",
89-
"properties": {
90-
"image": "caddy:2.4.6",
91-
"command": [
92-
"caddy",
93-
"reverse-proxy",
94-
"--from",
95-
"[concat(parameters('appName'), '.', parameters('location'), '.azurecontainer.io')]",
96-
"--to",
97-
"localhost:4000"
98-
],
99-
"ports": [
100-
{
101-
"protocol": "TCP",
102-
"port": 443
103-
},
104-
{
105-
"protocol": "TCP",
106-
"port": 80
107-
}
108-
],
109-
"environmentVariables": [],
110-
"resources": {
111-
"requests": {
112-
"memoryInGB": 1,
113-
"cpu": 1
114-
}
115-
},
116-
"volumeMounts": [
117-
{
118-
"name": "caddy-data",
119-
"mountPath": "/data"
120-
}
121-
]
122-
}
123-
}
124-
],
125-
"volumes": [
126-
{
127-
"name": "caddy-data",
128-
"azureFile": {
129-
"shareName": "caddy",
130-
"storageAccountName": "[parameters('storageAccountName')]",
131-
"storageAccountKey": "[parameters('storageAccountKey')]"
132-
}
13377
}
13478
],
13579
"imageRegistryCredentials": [
@@ -142,17 +86,9 @@
14286
"restartPolicy": "Always",
14387
"ipAddress": {
14488
"ports": [
145-
{
146-
"protocol": "TCP",
147-
"port": 443
148-
},
14989
{
15090
"protocol": "TCP",
15191
"port": 4000
152-
},
153-
{
154-
"protocol": "TCP",
155-
"port": 80
15692
}
15793
],
15894
"type": "Public",

0 commit comments

Comments
 (0)