-
Notifications
You must be signed in to change notification settings - Fork 510
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into 11276-search-field-border
- Loading branch information
Showing
255 changed files
with
11,720 additions
and
7,232 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -103,7 +103,7 @@ jobs: | |
| git checkout main | ||
| git status | ||
| git checkout - | ||
| git merge main --no-edit | ||
| git merge main --no-edit || git merge --abort | ||
| - uses: actions/checkout@v4 | ||
| if: ${{ ! vars.SKIP_BUILD || ! vars.SKIP_FUNCTION }} | ||
|
|
@@ -124,6 +124,12 @@ jobs: | |
| lfs: true | ||
| token: ${{ secrets.MDN_STUDIO_PAT }} | ||
|
|
||
| - uses: actions/checkout@v4 | ||
| if: ${{ ! vars.SKIP_BUILD }} | ||
| with: | ||
| repository: mdn/generic-content | ||
| path: mdn/generic-content | ||
|
|
||
| - uses: actions/checkout@v4 | ||
| if: ${{ ! vars.SKIP_BUILD }} | ||
| with: | ||
|
|
@@ -138,6 +144,26 @@ jobs: | |
| # See matching warning for mdn/content checkout step | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Checkout (translated-content-de) | ||
| uses: actions/checkout@v4 | ||
| if: ${{ ! vars.SKIP_BUILD || ! vars.SKIP_FUNCTION }} | ||
| with: | ||
| repository: mdn/translated-content-de | ||
| path: mdn/translated-content-de | ||
|
|
||
| - name: Move de into translated-content | ||
| if: ${{ ! vars.SKIP_BUILD || ! vars.SKIP_FUNCTION }} | ||
| run: | | ||
| mv mdn/translated-content-de/files/de mdn/translated-content/files/ | ||
| rm -rf mdn/translated-content-de | ||
| - name: Clean and commit de | ||
| if: ${{ ! vars.SKIP_BUILD || ! vars.SKIP_FUNCTION }} | ||
| working-directory: mdn/translated-content | ||
| run: | | ||
| git add files/de | ||
| git -c user.name='MDN' -c user.email='[email protected]' commit -m 'de' | ||
| - uses: actions/checkout@v4 | ||
| if: ${{ ! vars.SKIP_BUILD }} | ||
| with: | ||
|
|
@@ -155,7 +181,8 @@ jobs: | |
| if: ${{ ! vars.SKIP_BUILD }} | ||
| run: yarn --frozen-lockfile | ||
| env: | ||
| # https://github.com/microsoft/vscode-ripgrep#github-api-limit-note | ||
| # Use a GITHUB_TOKEN to bypass rate limiting for ripgrep and rari. | ||
| # See https://github.com/microsoft/vscode-ripgrep#github-api-limit-note | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| - name: Install Python | ||
|
|
@@ -199,8 +226,15 @@ jobs: | |
| CONTRIBUTOR_SPOTLIGHT_ROOT: ${{ github.workspace }}/mdn/mdn-contributor-spotlight/contributors | ||
| BLOG_ROOT: ${{ github.workspace }}/mdn/mdn-studio/content/posts | ||
| CURRICULUM_ROOT: ${{ github.workspace }}/mdn/curriculum | ||
| GENERIC_CONTENT_ROOT: ${{ github.workspace }}/mdn/generic-content/files | ||
| BASE_URL: "https://developer.allizom.org" | ||
|
|
||
| # rari | ||
| BUILD_OUT_ROOT: "client/build" | ||
| LIVE_SAMPLES_BASE_URL: https://live.mdnyalp.dev | ||
| INTERACTIVE_EXAMPLES_BASE_URL: https://interactive-examples.mdn.allizom.net | ||
| ADDITIONAL_LOCALES_FOR_GENERICS_AND_SPAS: de | ||
|
|
||
| # The default for this environment variable is geared for writers | ||
| # (aka. local development). Usually defaults are supposed to be for | ||
| # secure production but this is an exception and default | ||
|
|
@@ -277,31 +311,17 @@ jobs: | |
| echo "BLOG_ROOT=$BLOG_ROOT" | ||
| # Build the ServiceWorker first | ||
| yarn build:sw | ||
| yarn build:prepare | ||
| yarn tool sync-translated-content | ||
| # Build using one process per locale. | ||
| # Note: We have 4 cores, but 9 processes is a reasonable number. | ||
| for locale in en-us es fr ja ko pt-br ru zh-cn zh-tw; do | ||
| yarn build:docs --locale $locale 2>&1 | sed "s/^/[$locale] /" & | ||
| pids+=($!) | ||
| done | ||
| yarn build:client | ||
| yarn build:ssr | ||
| yarn tool build-robots-txt | ||
| for pid in "${pids[@]}"; do | ||
| wait $pid | ||
| done | ||
| yarn rari content sync-translated-content | ||
| yarn rari git-history | ||
| du -sh client/build | ||
| yarn rari build --all --issues client/build/issues.json --templ-stats | ||
| # Build the blog | ||
| yarn build:blog | ||
| # Build the curriculum | ||
| yarn build:curriculum | ||
| # Generate sitemap index file | ||
| yarn build --sitemap-index | ||
| # Sort DE search index by en-US popularity. | ||
| node scripts/reorder-search-index.mjs client/build/en-us/search-index.json client/build/de/search-index.json | ||
| # SSR all pages | ||
| yarn render:html | ||
|
|
@@ -311,6 +331,9 @@ jobs: | |
| yarn tool whatsdeployed $CONTENT_ROOT --output client/build/_whatsdeployed/content.json | ||
| yarn tool whatsdeployed $CONTENT_TRANSLATED_ROOT --output client/build/_whatsdeployed/translated-content.json | ||
| # Sort DE search index by en-US popularity. | ||
| node scripts/reorder-search-index.mjs client/build/en-us/search-index.json client/build/de/search-index.json | ||
| - name: Update search index | ||
| if: ${{ ! vars.SKIP_BUILD }} | ||
| env: | ||
|
|
@@ -370,7 +393,7 @@ jobs: | |
| for region in europe-west1 us-west1 asia-east1; do | ||
| gcloud beta functions deploy mdn-nonprod-stage-$region \ | ||
| --gen2 \ | ||
| --runtime=nodejs18 \ | ||
| --runtime=nodejs20 \ | ||
| --region=$region \ | ||
| --source=cloud-function \ | ||
| --trigger-http \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -58,6 +58,12 @@ jobs: | |
| lfs: true | ||
| token: ${{ secrets.MDN_STUDIO_PAT }} | ||
|
|
||
| - uses: actions/checkout@v4 | ||
| if: ${{ ! vars.SKIP_BUILD }} | ||
| with: | ||
| repository: mdn/generic-content | ||
| path: mdn/generic-content | ||
|
|
||
| - uses: actions/checkout@v4 | ||
| if: ${{ ! vars.SKIP_BUILD }} | ||
| with: | ||
|
|
@@ -72,6 +78,26 @@ jobs: | |
| # See matching warning for mdn/content checkout step | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Checkout (translated-content-de) | ||
| uses: actions/checkout@v4 | ||
| if: ${{ ! vars.SKIP_BUILD || ! vars.SKIP_FUNCTION }} | ||
| with: | ||
| repository: mdn/translated-content-de | ||
| path: mdn/translated-content-de | ||
|
|
||
| - name: Move de into translated-content | ||
| if: ${{ ! vars.SKIP_BUILD || ! vars.SKIP_FUNCTION }} | ||
| run: | | ||
| mv mdn/translated-content-de/files/de mdn/translated-content/files/ | ||
| rm -rf mdn/translated-content-de | ||
| - name: Clean and commit de | ||
| if: ${{ ! vars.SKIP_BUILD || ! vars.SKIP_FUNCTION }} | ||
| working-directory: mdn/translated-content | ||
| run: | | ||
| git add files/de | ||
| git -c user.name='MDN' -c user.email='[email protected]' commit -m 'de' | ||
| - uses: actions/checkout@v4 | ||
| if: ${{ ! vars.SKIP_BUILD }} | ||
| with: | ||
|
|
@@ -89,7 +115,8 @@ jobs: | |
| if: ${{ ! vars.SKIP_BUILD }} | ||
| run: yarn --frozen-lockfile | ||
| env: | ||
| # https://github.com/microsoft/vscode-ripgrep#github-api-limit-note | ||
| # Use a GITHUB_TOKEN to bypass rate limiting for ripgrep and rari. | ||
| # See https://github.com/microsoft/vscode-ripgrep#github-api-limit-note | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| - name: Print information about build | ||
|
|
@@ -109,8 +136,15 @@ jobs: | |
| CONTRIBUTOR_SPOTLIGHT_ROOT: ${{ github.workspace }}/mdn/mdn-contributor-spotlight/contributors | ||
| BLOG_ROOT: ${{ github.workspace }}/mdn/mdn-studio/content/posts | ||
| CURRICULUM_ROOT: ${{ github.workspace }}/mdn/curriculum | ||
| GENERIC_CONTENT_ROOT: ${{ github.workspace }}/mdn/generic-content/files | ||
| BASE_URL: "https://test.developer.allizom.org" | ||
|
|
||
| # rari | ||
| BUILD_OUT_ROOT: "client/build" | ||
| LIVE_SAMPLES_BASE_URL: https://live.test.mdnyalp.dev | ||
| INTERACTIVE_EXAMPLES_BASE_URL: https://interactive-examples.mdn.allizom.net | ||
| ADDITIONAL_LOCALES_FOR_GENERICS_AND_SPAS: de | ||
|
|
||
| # The default for this environment variable is geared for writers | ||
| # (aka. local development). Usually defaults are supposed to be for | ||
| # secure production but this is an exception and default | ||
|
|
@@ -155,7 +189,7 @@ jobs: | |
| REACT_APP_PLACEMENT_ENABLED: true | ||
|
|
||
| # Playground | ||
| REACT_APP_PLAYGROUND_BASE_HOST: play.test.mdn.allizom.net | ||
| REACT_APP_PLAYGROUND_BASE_HOST: test.mdnyalp.dev | ||
|
|
||
| # Observatory | ||
| REACT_APP_OBSERVATORY_API_URL: https://observatory-api.mdn.allizom.net | ||
|
|
@@ -168,31 +202,14 @@ jobs: | |
| echo "BLOG_ROOT=$BLOG_ROOT" | ||
| # Build the ServiceWorker first | ||
| yarn build:sw | ||
| yarn build:prepare | ||
| #yarn tool sync-translated-content | ||
| # Build using one process per locale. | ||
| # Note: We have 4 cores, but 9 processes is a reasonable number. | ||
| for locale in en-us fr; do | ||
| yarn build:docs --locale $locale 2>&1 | sed "s/^/[$locale] /" & | ||
| pids+=($!) | ||
| done | ||
| for pid in "${pids[@]}"; do | ||
| wait $pid | ||
| done | ||
| yarn build:client | ||
| yarn build:ssr | ||
| yarn tool build-robots-txt | ||
| du -sh client/build | ||
| yarn rari content sync-translated-content | ||
| yarn rari git-history | ||
| # Build the blog | ||
| yarn build:blog | ||
| # Build the curriculum | ||
| yarn build:curriculum | ||
| # Generate sitemap index file | ||
| yarn build --sitemap-index | ||
| yarn rari build --all --issues client/build/issues.json --templ-stats | ||
| # SSR all pages | ||
| yarn render:html | ||
|
|
@@ -202,6 +219,9 @@ jobs: | |
| yarn tool whatsdeployed $CONTENT_ROOT --output client/build/_whatsdeployed/content.json | ||
| yarn tool whatsdeployed $CONTENT_TRANSLATED_ROOT --output client/build/_whatsdeployed/translated-content.json | ||
| # Sort DE search index by en-US popularity. | ||
| node scripts/reorder-search-index.mjs client/build/en-us/search-index.json client/build/de/search-index.json | ||
| - name: Authenticate with GCP | ||
| uses: google-github-actions/auth@v2 | ||
| with: | ||
|
|
@@ -241,6 +261,7 @@ jobs: | |
| run: | | ||
| npm ci | ||
| npm run build-redirects | ||
| npm run build-canonicals | ||
| - name: Deploy Function | ||
| if: ${{ ! vars.SKIP_FUNCTION }} | ||
|
|
@@ -250,7 +271,7 @@ jobs: | |
| for region in europe-west3; do | ||
| gcloud beta functions deploy mdn-nonprod-test-$region \ | ||
| --gen2 \ | ||
| --runtime=nodejs18 \ | ||
| --runtime=nodejs20 \ | ||
| --region=$region \ | ||
| --source=cloud-function \ | ||
| --trigger-http \ | ||
|
|
||
Oops, something went wrong.