From 62d8b502700082a07b63f8171e306b6cd01d8f41 Mon Sep 17 00:00:00 2001 From: Marco Scoppetta Date: Tue, 12 Mar 2019 11:48:30 +0000 Subject: [PATCH 1/2] dont use docker image for CI --- .circleci/config.yml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index eef67d205..367158a39 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -44,6 +44,19 @@ commands: command: bazel build @graknlabs_grakn_core//:assemble-linux-targz - run: mkdir dist && tar -xvzf bazel-genfiles/external/graknlabs_grakn_core/grakn-core-all-linux.tar.gz -C ./dist/ - run: nohup ./dist/grakn-core-all-linux/grakn server start + + install-node: + steps: + - run: + name: Install nvm and node + command: | + curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.5/install.sh | bash + export NVM_DIR="/opt/circleci/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" + nvm install v10.5.0 + nvm alias default v10.5.0 + echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV + echo "[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"" >> $BASH_ENV jobs: build: @@ -66,14 +79,14 @@ jobs: - run: bazel test //:test-integration --test_output=streamed test-deployment: - docker: - - image: "circleci/node:9.6.1" + machine: true working_directory: ~/grakn steps: - checkout - install-bazel + - install-node - run: sudo apt install -y expect - - run: bazel --host_jvm_args="-Xmx2G" run //:deploy-npm -- test $REPO_GRAKN_USERNAME $REPO_GRAKN_PASSWORD $REPO_GRAKN_EMAIL + - run: bazel run //:deploy-npm -- test $REPO_GRAKN_USERNAME $REPO_GRAKN_PASSWORD $REPO_GRAKN_EMAIL - run-grakn-server # upgrade NPM and run tests - run: | From d9c2640040bbcc5b31532f3a06ee562b9657d4ec Mon Sep 17 00:00:00 2001 From: Marco Scoppetta Date: Tue, 12 Mar 2019 11:51:13 +0000 Subject: [PATCH 2/2] fix yaml --- .circleci/config.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 367158a39..6864dd51f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -48,15 +48,15 @@ commands: install-node: steps: - run: - name: Install nvm and node - command: | - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.5/install.sh | bash - export NVM_DIR="/opt/circleci/.nvm" - [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" - nvm install v10.5.0 - nvm alias default v10.5.0 - echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV - echo "[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"" >> $BASH_ENV + name: Install nvm and node + command: | + curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.5/install.sh | bash + export NVM_DIR="/opt/circleci/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" + nvm install v10.5.0 + nvm alias default v10.5.0 + echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV + echo "[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"" >> $BASH_ENV jobs: build: