From 17e2082ad556733f48cbf12284cc8ec399c6d505 Mon Sep 17 00:00:00 2001 From: mcasimir Date: Mon, 28 Sep 2020 10:43:36 +0200 Subject: [PATCH 1/4] chore: make build package private --- packages/build/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/build/package.json b/packages/build/package.json index 0237ec4800..8cfa4597c7 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -1,6 +1,7 @@ { "name": "@mongosh/build", "version": "0.4.0", + "private": true, "description": "MongoDB Shell Build Tools", "main": "lib/index.js", "types": "lib/index.d.ts", From 8d1d0ea212a02cb93ff57ff1e889c44350d19103 Mon Sep 17 00:00:00 2001 From: mcasimir Date: Mon, 28 Sep 2020 11:30:05 +0200 Subject: [PATCH 2/4] wip: try speed up tests and run e2e on real binary --- .evergreen.yml | 16 +++++++++------- package.json | 2 ++ packages/cli-repl/package.json | 1 + 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.evergreen.yml b/.evergreen.yml index 89ff220883..1a6b464a52 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -43,7 +43,10 @@ variables: bash ~/release_mongosh.sh fi - ls -la dist/ + export MONGOSH_TEST_EXECUTABLE_PATH="$(pwd)/dist/mongosh" + echo "$MONGOSH_TEST_EXECUTABLE_PATH" + npm run test-e2e-ci + - &compile_and_release_ps command: shell.exec params: @@ -57,6 +60,11 @@ variables: $Env:PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = "true" $Env:EVERGREEN_EXPANSIONS_PATH = $(Join-Path -Path '..' -ChildPath 'tmp/expansions.yaml' -Resolve) npm run evergreen-release package + .\.evergreen\DownloadAndRunMongod + $Env:MONGOSH_TEST_SERVER_URL = "mongodb://localhost:27018" + $Env:MONGOSH_TEST_EXECUTABLE_PATH = $(Join-Path -Path '.' -ChildPath 'dist/mongosh.exe' -Resolve) + echo "$Env:MONGOSH_TEST_EXECUTABLE_PATH" + npm run test-e2e-ci # Functions are any command that can be run. # @@ -116,9 +124,6 @@ functions: set -e source .evergreen/.setup_env export EVERGREEN_EXPANSIONS_PATH="$(pwd)/../tmp/expansions.yaml" - export MONGOSH_TEST_EXECUTABLE_PATH="$(pwd)/dist/mongosh" - echo "$MONGOSH_TEST_EXECUTABLE_PATH" - npm run compile-exec npm run test-ci test_ps: - command: expansions.write @@ -134,10 +139,7 @@ functions: .\.evergreen\SetupEnv .\.evergreen\DownloadAndRunMongod $Env:EVERGREEN_EXPANSIONS_PATH = $(Join-Path -Path '..' -ChildPath 'tmp/expansions.yaml' -Resolve) - npm run compile-exec - $Env:MONGOSH_TEST_EXECUTABLE_PATH = $(Join-Path -Path '.' -ChildPath 'dist/mongosh.exe' -Resolve) $Env:MONGOSH_TEST_SERVER_URL = "mongodb://localhost:27018" - echo "$Env:MONGOSH_TEST_EXECUTABLE_PATH" npm run test-ci release_macos: - command: expansions.write diff --git a/package.json b/package.json index f87bc85832..496fa9bd4c 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,8 @@ "check-ci": "lerna run check", "test": "lerna run test", "test-ci": "lerna run test-ci", + "test-e2e": "lerna run test-e2e", + "test-e2e-ci": "lerna run test-e2e-ci", "compile-ts": "lerna run compile-ts", "compile-cli": "lerna run compile-ts --scope @mongosh/cli-repl --include-dependencies", "prestart-cli": "npm run compile-cli", diff --git a/packages/cli-repl/package.json b/packages/cli-repl/package.json index a8d8481f1b..2e5b8d3170 100644 --- a/packages/cli-repl/package.json +++ b/packages/cli-repl/package.json @@ -22,6 +22,7 @@ "test-ci": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,test}/**/*.spec.ts\"", "pretest-e2e": "npm run compile-ts", "test-e2e": "mocha -r \"../../scripts/import-expansions.js\" --timeout 15000 --colors -r ts-node/register \"./test/e2e.spec.ts\"", + "test-e2e-ci": "mocha -r \"../../scripts/import-expansions.js\" --timeout 15000 --colors -r ts-node/register \"./test/e2e.spec.ts\"", "lint": "eslint \"**/*.{js,ts,tsx}\"", "check": "npm run lint", "prepublish": "npm run compile-ts" From 01d933fd3a9d1336487af84e233bb155ba40a62c Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Mon, 28 Sep 2020 13:15:24 +0200 Subject: [PATCH 3/4] use gcc 6 for build --- .evergreen.yml | 2 +- scripts/docker/ubuntu16.04-build.Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.evergreen.yml b/.evergreen.yml index 1a6b464a52..7d8b6d1f44 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -27,7 +27,7 @@ variables: -e NODE_JS_VERSION \ -e BUILD_VARIANT \ --rm -v $PWD:/tmp/build --network host ubuntu16.04-build \ - -c 'cd /tmp/build && npm run evergreen-release package' + -c 'cd /tmp/build && npm run evergreen-release package && dist/mongosh --version' else npm run evergreen-release package if [ `uname` == Darwin ]; then diff --git a/scripts/docker/ubuntu16.04-build.Dockerfile b/scripts/docker/ubuntu16.04-build.Dockerfile index f574a2c283..168bf41d28 100644 --- a/scripts/docker/ubuntu16.04-build.Dockerfile +++ b/scripts/docker/ubuntu16.04-build.Dockerfile @@ -12,9 +12,9 @@ RUN echo "deb-src https://deb.nodesource.com/node_12.x xenial main" | tee -a /et RUN add-apt-repository ppa:ubuntu-toolchain-r/test RUN apt-get update -RUN apt-get -y -qq install nodejs g++-9 rpm +RUN apt-get -y -qq install nodejs g++-6 rpm -ENV CC=gcc-9 -ENV CXX=g++-9 +ENV CC=gcc-6 +ENV CXX=g++-6 ENTRYPOINT [ "bash" ] From a9b7ac53dabe2aac51a017648330402d7066ed68 Mon Sep 17 00:00:00 2001 From: mcasimir Date: Mon, 28 Sep 2020 17:44:01 +0200 Subject: [PATCH 4/4] run test-e2e-ci with node 12 --- .evergreen.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.evergreen.yml b/.evergreen.yml index 1a6b464a52..0b7e6d796d 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -43,6 +43,7 @@ variables: bash ~/release_mongosh.sh fi + source .evergreen/.setup_env export MONGOSH_TEST_EXECUTABLE_PATH="$(pwd)/dist/mongosh" echo "$MONGOSH_TEST_EXECUTABLE_PATH" npm run test-e2e-ci