From 3cc58f5ff2487ee4bc613362a6a42f350322903d Mon Sep 17 00:00:00 2001 From: ioedeveloper Date: Fri, 2 Oct 2020 16:09:18 +0100 Subject: [PATCH] Changed remixd command in circleci --- apps/remix-ide/ci/browser_tests_chrome.sh | 2 +- apps/remix-ide/ci/browser_tests_firefox.sh | 2 +- apps/remix-ide/ci/browser_tests_run_deploy.sh | 10 ---------- package.json | 3 +-- 4 files changed, 3 insertions(+), 14 deletions(-) diff --git a/apps/remix-ide/ci/browser_tests_chrome.sh b/apps/remix-ide/ci/browser_tests_chrome.sh index 6a15f1207c..96357267ed 100755 --- a/apps/remix-ide/ci/browser_tests_chrome.sh +++ b/apps/remix-ide/ci/browser_tests_chrome.sh @@ -7,7 +7,7 @@ setupRemixd () { cd apps/remix-ide/contracts echo 'sharing folder: ' echo $PWD - ../../../node_modules/.bin/remixd -s $PWD --remix-ide http://127.0.0.1:8080 & + npx nx serve remixd --folder=$PWD --remixide=http://127.0.0.1:8080 & cd ../../.. } diff --git a/apps/remix-ide/ci/browser_tests_firefox.sh b/apps/remix-ide/ci/browser_tests_firefox.sh index d2058c1afb..289909e984 100755 --- a/apps/remix-ide/ci/browser_tests_firefox.sh +++ b/apps/remix-ide/ci/browser_tests_firefox.sh @@ -7,7 +7,7 @@ setupRemixd () { cd apps/remix-ide/contracts echo 'sharing folder: ' echo $PWD - ../../../node_modules/.bin/remixd -s $PWD --remix-ide http://127.0.0.1:8080 & + npx nx serve remixd --folder=$PWD --remixide=http://127.0.0.1:8080 & cd ../../.. } diff --git a/apps/remix-ide/ci/browser_tests_run_deploy.sh b/apps/remix-ide/ci/browser_tests_run_deploy.sh index 38ec439873..aa3ff4885f 100755 --- a/apps/remix-ide/ci/browser_tests_run_deploy.sh +++ b/apps/remix-ide/ci/browser_tests_run_deploy.sh @@ -2,22 +2,12 @@ set -e -setupRemixd () { - mkdir remixdSharedfolder - cd apps/remix-ide/contracts - echo 'sharing folder: ' - echo $PWD - ../../../node_modules/.bin/remixd -s $PWD --remix-ide http://127.0.0.1:8080 & - cd ../../.. -} - BUILD_ID=${CIRCLE_BUILD_NUM:-${TRAVIS_JOB_NUMBER}} echo "$BUILD_ID" TEST_EXITCODE=0 npm run ganache-cli & npm run serve & -setupRemixd sleep 5 diff --git a/package.json b/package.json index da37bfdea5..99967f1215 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "nightwatch_local_fileManager": "nx build remix-ide-e2e; nx e2e remix-ide-e2e --filePath=dist/apps/remix-ide-e2e/src/tests/fileManager_api.test.js --env=chrome", "nightwatch_local_runAndDeploy": "nx build remix-ide-e2e; nx e2e remix-ide-e2e --filePath=dist/apps/remix-ide-e2e/src/tests/runAndDeploy.js --env=chrome-runAndDeploy", "onchange": "onchange apps/remix-ide/build/app.js -- npm-run-all lint", - "remixd": "remixd -s ./apps/remix-ide/contracts --remix-ide http://127.0.0.1:8080", + "remixd": "nx build remixd; nx serve remixd --folder=./apps/remix-ide/contracts --remixide=http://127.0.0.1:8080", "selenium": "selenium-standalone start", "selenium-install": "selenium-standalone install", "sourcemap": "exorcist --root ../ apps/remix-ide/build/app.js.map > apps/remix-ide/build/app.js", @@ -241,7 +241,6 @@ "onchange": "^3.2.1", "prettier": "1.19.1", "remix-tabs": "1.0.48", - "remixd": "0.2.3-alpha.4", "request": "^2.83.0", "rimraf": "^2.6.1", "selenium-standalone": "^6.17.0",