-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main' into main
* upstream/main: (164 commits) skip empty srcs for safe iframe srcs (mdn#3216) correct code comment (mdn#3223) build(deps): bump ahmadnassri/action-dependabot-auto-merge (mdn#3197) build(deps-dev): bump @types/react-dom from 17.0.1 to 17.0.2 (mdn#3164) create a whatsdeployed.json for translated-content too (mdn#3221) avoid double-slash redirects (mdn#3222) build(deps): bump image-size from 0.9.4 to 0.9.5 (mdn#3214) build(deps): bump boto3 from 1.17.22 to 1.17.26 in /deployer (mdn#3212) Fix our auto-merge workflow (mdn#3218) build(deps-dev): bump ts-loader from 8.0.17 to 8.0.18 (mdn#3208) disable lighthouse PR check unless relevant changes (mdn#3203) hide toolbar for frozen locales (mdn#3213) build(deps): bump is-svg from 4.2.1 to 4.2.2 (mdn#3209) build(deps): bump @mdn/browser-compat-data from 3.1.3 to 3.2.0 (mdn#3210) downloading external images for translated-content (mdn#3207) add active locales (mdn#3201) add tool command for rendering/removing macros (mdn#2955) unsafe html should be a breaking flaw (mdn#3192) open editor for translated content (mdn#3196) add fundamental redirects for /en-US/Security/CSP (mdn#3200) ...
- Loading branch information
Showing
184 changed files
with
10,033 additions
and
4,199 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| # This starts up a simulator that tries to do what our Lambda@Edge does. | ||
|
|
||
| name: content-origin-request | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches: | ||
| - main | ||
| paths: | ||
| - deployer/aws-lambda/** | ||
| - libs/** | ||
| - .github/workflows/content-origin-request.yml | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
|
|
||
| - name: Setup Node.js environment | ||
| uses: actions/setup-node@v2.1.5 | ||
| with: | ||
| node-version: "12" | ||
|
|
||
| - name: Cache node_modules | ||
| uses: actions/cache@v2.1.4 | ||
| id: cached-node_modules | ||
| with: | ||
| path: | | ||
| deployer/aws-lambda/content-origin-request/node_modules | ||
| key: ${{ runner.os }}-${{ hashFiles('deployer/aws-lambda/content-origin-request/yarn.lock') }}-${{ hashFiles('libs/**/*.js') }} | ||
|
|
||
| - name: Install all yarn packages | ||
| if: steps.cached-node_modules.outputs.cache-hit != 'true' | ||
| working-directory: deployer/aws-lambda/content-origin-request | ||
| run: yarn --frozen-lockfile | ||
|
|
||
| - name: Run test server | ||
| working-directory: deployer/aws-lambda/content-origin-request | ||
| run: | | ||
| yarn serve > /tmp/stdout.log 2> /tmp/stderr.log & | ||
| - name: Check that the server started | ||
| run: curl --retry-connrefused --retry 5 -I http://localhost:7000/ping | ||
|
|
||
| - name: Preflight the integration tests | ||
| run: | | ||
| curl -I http://localhost:7000/docs/Web | ||
| curl -I http://localhost:7000/en-US/docs/Web/ | ||
| - name: Unit test | ||
| working-directory: deployer/aws-lambda/content-origin-request | ||
| run: | | ||
| yarn test-server | ||
| - name: Debug any server outputs | ||
| run: | | ||
| echo "____STDOUT____" | ||
| cat /tmp/stdout.log | ||
| echo "____STDERR____" | ||
| cat /tmp/stderr.log |
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 |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| # Instead of waiting for Yari to be published to npmjs.com and be upgraded | ||
| # inside mdn/content by Dependabot, we do all those steps here using `npm pack`. | ||
|
|
||
| name: NPM Publish simulation | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches: | ||
| - main | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
|
|
||
| - uses: actions/checkout@v2 | ||
| with: | ||
| repository: mdn/content | ||
| path: mdn/content | ||
|
|
||
| - name: Setup Node.js environment | ||
| uses: actions/setup-node@v2.1.5 | ||
| with: | ||
| node-version: "12" | ||
|
|
||
| - name: Cache node_modules | ||
| uses: actions/cache@v2.1.4 | ||
| id: cached-node_modules | ||
| with: | ||
| path: | | ||
| node_modules | ||
| key: ${{ runner.os }}-${{ hashFiles('yarn.lock') }} | ||
|
|
||
| - name: Install all yarn packages | ||
| if: steps.cached-node_modules.outputs.cache-hit != 'true' | ||
| env: | ||
| PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: 1 | ||
| run: yarn --frozen-lockfile | ||
|
|
||
| - name: Setup kernel for react native, increase watchers | ||
| run: | | ||
| # When running Yari on Linux, you might get the | ||
| # "Error: ENOSPC: System limit for number of file watchers reached" error. | ||
| # This, resolves that. | ||
| # Source https://github.com/expo/expo-github-action/issues/20#issuecomment-541676895 | ||
| echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p | ||
| - name: Prepare to build | ||
| env: | ||
| # The following env vars is what we do in npm-publish.yml | ||
| # Each variable set is documented there. | ||
|
|
||
| REACT_APP_CRUD_MODE: true | ||
| REACT_APP_DISABLE_AUTH: true | ||
| CONTENT_ROOT: testing/content/files | ||
| run: | | ||
| yarn prepare-build | ||
| - name: Build and install tarball | ||
| run: | | ||
| echo mdn/content/ >> .npmignore | ||
| npm pack | ||
| TARBALL=`ls mdn-yari-*.tgz` | ||
| echo $TARBALL | ||
| ls -lh $TARBALL | ||
| mv $TARBALL mdn/content/ | ||
| cd mdn/content | ||
| yarn add file:$TARBALL | ||
| - name: Start Yari from mock content repo | ||
| working-directory: mdn/content | ||
| run: | | ||
| yarn start > /tmp/stdout.log 2> /tmp/stderr.log & | ||
| - name: View some URLs on localhost:5000 | ||
| run: | | ||
| curl --retry-connrefused --retry 5 -I http://localhost:5000 | ||
| # Basically, test if it 200 OKs. If not, this'll exit non-zero. | ||
| curl http://localhost:5000/en-US/ > /dev/null | ||
| curl http://localhost:5000/en-US/docs/MDN/Kitchensink > /dev/null | ||
| - name: Test viewing the dev server | ||
| env: | ||
| # This will make sure the tests in `testing/tests/*.test.js` only run | ||
| # if the development server is up and ready to be tested. | ||
| TESTING_DEVELOPING: true | ||
| # Use local chrome installs since we skip downloading it as part | ||
| # of the yarn installs above | ||
| PUPPETEER_EXECUTABLE_PATH: /usr/bin/google-chrome | ||
| # When running Yari from within mdn/content it only starts 1 server; | ||
| # the one on localhost:5000. No React dev server; the one | ||
| # on localhost:3000. | ||
| # Testing that dev server is not relevant or important in this context. | ||
| DEVELOPING_SKIP_DEV_URL: true | ||
| run: | | ||
| yarn test:testing developing | ||
| - name: Debug server's stdout and stderr if tests failed | ||
| if: failure() | ||
| run: | | ||
| echo "STDOUT..................................................." | ||
| cat /tmp/stdout.log | ||
| echo "" | ||
| echo "STDERR..................................................." | ||
| cat /tmp/stderr.log | ||
| - name: SSR build a page | ||
| working-directory: mdn/content | ||
| run: | | ||
| yarn build files/en-us/mdn/kitchensink/index.html |
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
Oops, something went wrong.