diff --git a/.github/workflows/sapling-addons.yml b/.github/workflows/sapling-addons.yml index 011011eb48..848ee4b90c 100644 --- a/.github/workflows/sapling-addons.yml +++ b/.github/workflows/sapling-addons.yml @@ -28,4 +28,4 @@ jobs: run: yarn install --prefer-offline - name: Run addons/verify-addons-folder.py working-directory: ./addons - run: ./verify-addons-folder.py + run: ./verify-addons-folder.py --skip-integration-tests diff --git a/addons/verify-addons-folder.py b/addons/verify-addons-folder.py index 4030d9823e..709679d5cc 100755 --- a/addons/verify-addons-folder.py +++ b/addons/verify-addons-folder.py @@ -23,6 +23,7 @@ Verifies the contents of this folder by running tests and linters. Requirements: - `node` and `yarn` are on the `$PATH` - `yarn install` has already been run in the addons/ folder +- `sl` required to be on the PATH for isl integration tests """, formatter_class=RawTextHelpFormatter, ) @@ -31,17 +32,22 @@ Requirements: help=("No-op. Provided for compatibility."), action="store_true", ) + parser.add_argument( + "--skip-integration-tests", + help=("Don't run isl integrations tests"), + action="store_true", + ) args = parser.parse_args() - asyncio.run(verify()) + asyncio.run(verify(args)) -async def verify(): +async def verify(args): await asyncio.gather( verify_prettier(), verify_shared(), verify_components(), verify_textmate(), - verify_isl(), + verify_isl(args), ) @@ -75,7 +81,7 @@ async def verify_textmate(): timer.report(ok("textmate/")) -async def verify_isl(): +async def verify_isl(args): """Verifies isl/ and isl-server/ and vscode/ as the builds are interdependent""" timer = Timer("verifying ISL") isl = addons / "isl" @@ -96,8 +102,10 @@ async def verify_isl(): lint_and_test(isl_server), lint_and_test(vscode), ) - # run integration tests separately to reduce flakiness from CPU contention with normal unit tests - await run_isl_integration_tests() + if not args.skip_integration_tests: + timer.report("running isl integration tests") + # run integration tests separately to reduce flakiness from CPU contention with normal unit tests + await run_isl_integration_tests() timer.report(ok("ISL"))