Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions .evergreen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -43,7 +43,11 @@ variables:
bash ~/release_mongosh.sh
fi

ls -la dist/
source .evergreen/.setup_env
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:
Expand All @@ -57,6 +61,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.
#
Expand Down Expand Up @@ -116,9 +125,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
Expand All @@ -134,10 +140,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
Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions packages/build/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
1 change: 1 addition & 0 deletions packages/cli-repl/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions scripts/docker/ubuntu16.04-build.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]