remix-project-org · ioedeveloper · Jul 15, 2020 · May 12, 2020 · May 25, 2020 · May 25, 2020
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output

diff --git a/apps/remix-ide/.circleci/config.yml b/apps/remix-ide/.circleci/config.yml
@@ -7,7 +7,7 @@ jobs:
   remix-ide-chrome:
     docker:
       # specify the version you desire here
-      - image: circleci/node:9.11.2-browsers
+      - image: circleci/node:10.18.0-browsers
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -17,31 +17,39 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "[email protected]"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
-    working_directory: ~/remix-ide
+      - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
+    working_directory: ~/remix-project
 
     parallelism: 20
     steps:
       - checkout
       - run: npm install
-      - run: npm run lint && npm run test && npm run make-mock-compiler
+      - run: npm run lint
+      - run:
+          name: Download Compatible JAVA Version for Selenium
+          command: |
+            java -version
+            sudo apt-get purge --auto-remove java-common
+            sudo apt-get update
+            sudo apt-get install openjdk-8-jdk
+            java -version
       - run:
           name: Download Selenium
-          command: ./node_modules/.bin/selenium-standalone install --config=../remix-ide/seleniumConfig.js
+          command: ./node_modules/.bin/selenium-standalone install --config=../remix-project/apps/remix-ide/seleniumConfig.js
       - run:
           name: Start Selenium
-          command: ./node_modules/.bin/selenium-standalone start --config=../remix-ide/seleniumConfig.js
+          command: ./node_modules/.bin/selenium-standalone start --config=../remix-project/apps/remix-ide/seleniumConfig.js
           background: true
-      - run: ./ci/browser_tests_chrome.sh
+      - run: ./apps/remix-ide/ci/browser_tests_chrome.sh
       - store_test_results:
-          path: ./reports/tests
+          path: ./apps/remix-ide/reports/tests
       - store_artifacts:
-          path: ./reports/screenshots
+          path: ./apps/remix-ide/reports/screenshots
 
   remix-ide-firefox:
     docker:
       # specify the version you desire here
-      - image: circleci/node:9.11.2-browsers
+      - image: circleci/node:10.18.0-browsers
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -51,37 +59,37 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "[email protected]"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
-    working_directory: ~/remix-ide
+      - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
+    working_directory: ~/remix-project
 
     parallelism: 20
     steps:
       - checkout
       - run: npm install
-      - run: npm run lint && npm run test && npm run make-mock-compiler
+      - run: npm run lint
       - run:
           name: Download Selenium
-          command: ./node_modules/.bin/selenium-standalone install --config=../remix-ide/seleniumConfig.js
+          command: ./node_modules/.bin/selenium-standalone install --config=../remix-project/apps/remix-ide/seleniumConfig.js
       - run:
           name: Start Selenium
-          command: ./node_modules/.bin/selenium-standalone start --config=../remix-ide/seleniumConfig.js
+          command: ./node_modules/.bin/selenium-standalone start --config=../remix-project/apps/remix-ide/seleniumConfig.js
           background: true
       - run:
           name: Download Latest Firefox
           command: sudo apt-get purge -y firefox && wget https://sourceforge.net/projects/ubuntuzilla/files/mozilla/apt/pool/main/f/firefox-mozilla-build/firefox-mozilla-build_73.0.1-0ubuntu1_amd64.deb
       - run:
           name: Install Firefox
           command: sudo dpkg -i firefox-mozilla-build_73.0.1-0ubuntu1_amd64.deb
-      - run: ./ci/browser_tests_firefox.sh
+      - run: ./apps/remix-ide/ci/browser_tests_firefox.sh
       - store_test_results:
-          path: ./reports/tests
+          path: ./apps/remix-ide/reports/tests
       - store_artifacts:
-          path: ./reports/screenshots
+          path: ./apps/remix-ide/reports/screenshots
 
   remix-ide-run-deploy:
     docker:
       # specify the version you desire here
-      - image: circleci/node:9.11.2-browsers
+      - image: circleci/node:10.18.0-browsers
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -91,29 +99,29 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "[email protected]"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
-    working_directory: ~/remix-ide
+      - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
+    working_directory: ~/remix-project
 
     steps:
       - checkout
       - run: npm install
-      - run: npm run lint && npm run test && npm run make-mock-compiler
+      - run: npm run lint
       - run:
           name: Download Selenium
-          command: ./node_modules/.bin/selenium-standalone install --config=../remix-ide/seleniumConfig.js
+          command: ./node_modules/.bin/selenium-standalone install --config=../remix-project/apps/remix-ide/seleniumConfig.js
       - run:
           name: Start Selenium
-          command: ./node_modules/.bin/selenium-standalone start --config=../remix-ide/seleniumConfig.js
+          command: ./node_modules/.bin/selenium-standalone start --config=../remix-project/apps/remix-ide/seleniumConfig.js
           background: true
-      - run: ./ci/browser_tests_run_deploy.sh
+      - run: ./apps/remix-ide/ci/browser_tests_run_deploy.sh
       - store_artifacts:
-          path: ./reports/screenshots
+          path: ./apps/remix-ide/reports/screenshots
 
 
   deploy-remix-live:
     docker:
       # specify the version you desire here
-      - image: circleci/node:9.11.2-browsers
+      - image: circleci/node:10.18.0-browsers
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -123,21 +131,21 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "[email protected]"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
-    working_directory: ~/remix-ide
+      - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
+    working_directory: ~/remix-project
 
     steps:
       - checkout
       - run: npm install
-      - run: npm run lint && npm run test && npm run make-mock-compiler
+      - run: npm run lint
       - run: 
           name: Deploy
           command: |
             if [ "${CIRCLE_BRANCH}" == "remix_live" ]; then
-              ./ci/deploy_from_travis_remix-live.sh;
+              ./apps/remix-ide/ci/deploy_from_travis_remix-live.sh;
             fi
       - store_artifacts:
-          path: ./reports/screenshots
+          path: ./apps/remix-ide/reports/screenshots
 
   publish-docker:
     docker:
@@ -165,7 +173,7 @@ jobs:
   deploy-remix-alpha:
     docker:
       # specify the version you desire here
-      - image: circleci/node:9.11.2-browsers
+      - image: circleci/node:10.18.0-browsers
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -175,21 +183,21 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "[email protected]"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
-    working_directory: ~/remix-ide
+      - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
+    working_directory: ~/remix-project
 
     steps:
       - checkout
       - run: npm install
-      - run: npm run lint && npm run test && npm run make-mock-compiler
+      - run: npm run lint
       - run: 
           name: Deploy
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              ./ci/deploy_from_travis_remix-alpha.sh;
+              ./apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh;
             fi
       - store_artifacts:
-          path: ./reports/screenshots
+          path: ./apps/remix-ide/reports/screenshots
 
 workflows:
   version: 2
@@ -218,4 +226,4 @@ workflows:
             - remix-ide-run-deploy
           filters:
             branches:
-              only: master
+              only: master
diff --git a/apps/remix-ide/.gitignore b/apps/remix-ide/.gitignore
@@ -1,6 +1,3 @@
-
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-
 .idea
 .vscode
 build
@@ -15,4 +12,4 @@ remix
 contracts
 TODO
 .tern-port
-temp_publish_docker
+temp_publish_docker
diff --git a/apps/remix-ide/ci/browser_tests.sh b/apps/remix-ide/ci/browser_tests.sh
@@ -21,7 +21,8 @@ setupRemixd
 
 sleep 5
 
-TESTFILES=$(circleci tests glob "./test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
+npm run nightwatch_parallel || TEST_EXITCODE=1
+TESTFILES=$(circleci tests glob "./apps/remix-ide/test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
 for TESTFILE in $TESTFILES; do
     ./node_modules/.bin/nightwatch --config nightwatch.js --env chrome $TESTFILE || TEST_EXITCODE=1
 done

diff --git a/apps/remix-ide/ci/browser_tests_chrome.sh b/apps/remix-ide/ci/browser_tests_chrome.sh
@@ -23,7 +23,7 @@ sleep 5
 
 TESTFILES=$(circleci tests glob "./apps/remix-ide/test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
 for TESTFILE in $TESTFILES; do
-    ./node_modules/.bin/nightwatch --config nightwatch.js --env chrome $TESTFILE || TEST_EXITCODE=1
+    ./node_modules/.bin/nightwatch --config ./apps/remix-ide/nightwatch.js --env chrome $TESTFILE || TEST_EXITCODE=1
 done
 
 echo "$TEST_EXITCODE"

diff --git a/apps/remix-ide/ci/browser_tests_firefox.sh b/apps/remix-ide/ci/browser_tests_firefox.sh
@@ -23,7 +23,7 @@ sleep 5
 
 TESTFILES=$(circleci tests glob "./apps/remix-ide/test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
 for TESTFILE in $TESTFILES; do
-    ./node_modules/.bin/nightwatch --config nightwatch.js --env firefox $TESTFILE || TEST_EXITCODE=1
+    ./node_modules/.bin/nightwatch --config ./apps/remix-ide/nightwatch.js --env firefox $TESTFILE || TEST_EXITCODE=1
 done
 
 echo "$TEST_EXITCODE"

diff --git a/apps/remix-ide/favicon.ico b/apps/remix-ide/favicon.ico
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		# See http://help.github.com/ignore-files/ for more about ignoring files.

		# compiled output
Expand Down