From efb03d9d3709dc99b28648596ff3626d5481720b Mon Sep 17 00:00:00 2001 From: Shihua Zheng Date: Thu, 4 Apr 2024 09:31:58 -0700 Subject: [PATCH] Perform PR build test (#6788) * Change test * Update .github/workflows/lint.yaml Co-authored-by: Daniel Rozenberg * Fix all --------- Co-authored-by: Daniel Rozenberg --- .github/workflows/lint-yaml.yaml | 29 ----------- .github/workflows/{lint-js.yaml => lint.yaml} | 14 ++++-- .github/workflows/test-default.yaml | 13 ----- .github/workflows/test-platform.yaml | 6 +-- .github/workflows/test-playground.yaml | 6 +-- package-lock.json | 49 ++++++++++++------- package.json | 13 +++-- playground/src/validator/validator.js | 2 +- 8 files changed, 58 insertions(+), 74 deletions(-) delete mode 100644 .github/workflows/lint-yaml.yaml rename .github/workflows/{lint-js.yaml => lint.yaml} (72%) delete mode 100644 .github/workflows/test-default.yaml diff --git a/.github/workflows/lint-yaml.yaml b/.github/workflows/lint-yaml.yaml deleted file mode 100644 index 8ca2e44d041..00000000000 --- a/.github/workflows/lint-yaml.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -name: 'Lint: YAML' - -on: - workflow_dispatch: - push: - paths: - - '**/*.yml' - - '**/*.yaml' - - '!.github/**/*.yaml' -jobs: - test: - runs-on: ubuntu-latest - steps: - - name: Cloning repository - uses: actions/checkout@v4 - - - name: Setting up Node.js - uses: actions/setup-node@v4 - with: - node-version: 16 - cache: npm - - - name: Installing Node.js packages - run: npm ci - - - name: Linting YAML files - run: | - gulp lintYaml diff --git a/.github/workflows/lint-js.yaml b/.github/workflows/lint.yaml similarity index 72% rename from .github/workflows/lint-js.yaml rename to .github/workflows/lint.yaml index 6a99331debd..bf64f0c306d 100644 --- a/.github/workflows/lint-js.yaml +++ b/.github/workflows/lint.yaml @@ -1,11 +1,13 @@ --- -name: 'Lint: JavaScript' +name: 'Lint: all' on: workflow_dispatch: push: - paths: - - '**/*.js' + branches: + - main + pull_request: + jobs: test: runs-on: ubuntu-latest @@ -22,6 +24,8 @@ jobs: - name: Installing Node.js packages run: npm ci + - name: Linting YAML files + run: gulp lintYaml + - name: Linting JavaScript files - run: | - gulp lintNode + run: gulp lintNode diff --git a/.github/workflows/test-default.yaml b/.github/workflows/test-default.yaml deleted file mode 100644 index ac8d30fb4e9..00000000000 --- a/.github/workflows/test-default.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -name: 'Test: Default' - -on: [push, pull_request] - -jobs: - test: - runs-on: ubuntu-latest - steps: - - - name: 'Default' - run: | - echo 'we require a job named "test", but not all pull requests trigger an action. So we created this small silly job named "test" that will always pass, just to make sure nothing hangs as a result of not triggering an actual job.' diff --git a/.github/workflows/test-platform.yaml b/.github/workflows/test-platform.yaml index 688fdcf1197..a6f384f4270 100644 --- a/.github/workflows/test-platform.yaml +++ b/.github/workflows/test-platform.yaml @@ -4,9 +4,9 @@ name: 'Test: Platform' on: workflow_dispatch: push: - paths: - - 'package.json' - - 'platform/lib/**' + branches: + - main + pull_request: jobs: test: diff --git a/.github/workflows/test-playground.yaml b/.github/workflows/test-playground.yaml index d07e602c51f..1ba79202e33 100644 --- a/.github/workflows/test-playground.yaml +++ b/.github/workflows/test-playground.yaml @@ -4,9 +4,9 @@ name: 'Test: Playground' on: workflow_dispatch: push: - paths: - - 'package.json' - - 'playground/**' + branches: + - main + pull_request: jobs: test: diff --git a/package-lock.json b/package-lock.json index d2a2d40bb8c..5bfd6187d39 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,7 +74,7 @@ "@rollup/plugin-node-resolve": "15.2.3", "@rollup/plugin-replace": "5.0.5", "absolutify": "0.1.0", - "amphtml-validator": "1.0.35", + "amphtml-validator": "1.0.38", "ansi-colors": "4.1.3", "archiver": "6.0.1", "babel-loader": "9.1.3", @@ -4633,23 +4633,32 @@ } }, "node_modules/amphtml-validator": { - "version": "1.0.35", - "resolved": "https://registry.npmjs.org/amphtml-validator/-/amphtml-validator-1.0.35.tgz", - "integrity": "sha512-C67JzC5EI6pE2C0sAo/zuCp8ARDl1Vtt6/s0nr+3NuXDNOdkjclZUkaNAd/ZnsEvvYodkXZ6T/uww890IQh9dQ==", + "version": "1.0.38", + "resolved": "https://registry.npmjs.org/amphtml-validator/-/amphtml-validator-1.0.38.tgz", + "integrity": "sha512-TqGeHVRUEsMiJoaRvMhzZBv8oljLhhJgzkaPX/zT2eJFG5FLeaMehd6riNwsuMmi9e/5xsI0pocbTgN/u2sonQ==", "dev": true, "dependencies": { "colors": "1.4.0", - "commander": "7.2.0", - "promise": "8.1.0" + "commander": "12.0.0", + "promise": "8.3.0" }, "bin": { "amphtml-validator": "cli.js" } }, + "node_modules/amphtml-validator/node_modules/commander": { + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-12.0.0.tgz", + "integrity": "sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==", + "dev": true, + "engines": { + "node": ">=18" + } + }, "node_modules/amphtml-validator/node_modules/promise": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz", - "integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/promise/-/promise-8.3.0.tgz", + "integrity": "sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==", "dev": true, "dependencies": { "asap": "~2.0.6" @@ -43772,20 +43781,26 @@ "requires": {} }, "amphtml-validator": { - "version": "1.0.35", - "resolved": "https://registry.npmjs.org/amphtml-validator/-/amphtml-validator-1.0.35.tgz", - "integrity": "sha512-C67JzC5EI6pE2C0sAo/zuCp8ARDl1Vtt6/s0nr+3NuXDNOdkjclZUkaNAd/ZnsEvvYodkXZ6T/uww890IQh9dQ==", + "version": "1.0.38", + "resolved": "https://registry.npmjs.org/amphtml-validator/-/amphtml-validator-1.0.38.tgz", + "integrity": "sha512-TqGeHVRUEsMiJoaRvMhzZBv8oljLhhJgzkaPX/zT2eJFG5FLeaMehd6riNwsuMmi9e/5xsI0pocbTgN/u2sonQ==", "dev": true, "requires": { "colors": "1.4.0", - "commander": "7.2.0", - "promise": "8.1.0" + "commander": "12.0.0", + "promise": "8.3.0" }, "dependencies": { + "commander": { + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-12.0.0.tgz", + "integrity": "sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==", + "dev": true + }, "promise": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz", - "integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/promise/-/promise-8.3.0.tgz", + "integrity": "sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==", "dev": true, "requires": { "asap": "~2.0.6" diff --git a/package.json b/package.json index fa1ce7eae46..5675753ba3b 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,11 @@ "_test:pixi:e2e": "APP_ENV=local jest --forceExit -c e2e.jest.config.js", "test:grow-extensions": "cd pages/extensions && if which grow; then python3 -m unittest discover -p \"*_test.py\"; else echo grow not installed with pip. skip tests; fi" }, - "keywords": ["amphtml", "framework", "documentation"], + "keywords": [ + "amphtml", + "framework", + "documentation" + ], "author": "The AMP HTML Authors", "license": "Apache-2.0", "signale": { @@ -49,7 +53,10 @@ "@boilerplate": "boilerplate", "@lib": "platform/lib" }, - "browserslist": ["last 2 versions", "not dead"], + "browserslist": [ + "last 2 versions", + "not dead" + ], "dependencies": { "@ampproject/toolbox-cache-list": "2.9.0", "@ampproject/toolbox-cors": "2.9.0", @@ -115,7 +122,7 @@ "@rollup/plugin-node-resolve": "15.2.3", "@rollup/plugin-replace": "5.0.5", "absolutify": "0.1.0", - "amphtml-validator": "1.0.35", + "amphtml-validator": "1.0.38", "ansi-colors": "4.1.3", "archiver": "6.0.1", "babel-loader": "9.1.3", diff --git a/playground/src/validator/validator.js b/playground/src/validator/validator.js index e5c14bd7e8c..79b06731d0e 100644 --- a/playground/src/validator/validator.js +++ b/playground/src/validator/validator.js @@ -17,7 +17,7 @@ import events from '../events/events.js'; import lazyLoad from '../lazy-load/base.js'; import {EVENT_SET_RUNTIME} from '../runtime/runtimes.js'; -const DEFAULT_VALIDATOR_URL = 'https://ampjs.org/v0/validator_wasm.js'; +const DEFAULT_VALIDATOR_URL = 'https://cdn.ampproject.org/v0/validator_wasm.js'; export const NO_ERRORS = { errors: [],