From dae63e54b06790e1385a8398c55626159c12d25e Mon Sep 17 00:00:00 2001 From: filip mertens Date: Thu, 15 Sep 2022 12:36:58 +0200 Subject: [PATCH 01/14] update browser tools --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 68067dc539..b9fa51038e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ parameters: type: boolean default: false orbs: - browser-tools: circleci/browser-tools@1.3.0 + browser-tools: circleci/browser-tools@1.4.0 jobs: build: docker: From f42fcfea49ef333184fb3a0a7445a92f2b916027 Mon Sep 17 00:00:00 2001 From: filip mertens Date: Thu, 15 Sep 2022 12:48:04 +0200 Subject: [PATCH 02/14] update img --- .circleci/config.yml | 186 ++++++++++++++++++++++++++----------------- 1 file changed, 115 insertions(+), 71 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b9fa51038e..40e5e6d954 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,16 +9,18 @@ parameters: default: false orbs: browser-tools: circleci/browser-tools@1.4.0 + node: circleci/node@5.0.2 jobs: build: docker: # specify the version you desire here - - image: cimg/node:14.17.6-browsers + - image: cimg/base:current # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images # documented at https://circleci.com/docs/2.0/circleci-images/ - resource_class: xlarge + resource_class: + xlarge # - image: circleci/mongo:3.4.4 environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" @@ -26,7 +28,9 @@ jobs: working_directory: ~/remix-project steps: - checkout - + - node/install: + install-yarn: true + node-version: "v14.17.6" - restore_cache: keys: - v1-deps-{{ checksum "yarn.lock" }} @@ -38,22 +42,23 @@ jobs: - run: yarn run downloadsolc_assets - run: npx nx build remix-ide - run: npx nx build remix-ide-e2e-src-local-plugin - + - run: yarn run build:libs - run: mkdir persist && zip -r persist/dist.zip dist - persist_to_workspace: root: . paths: - - 'persist' + - "persist" lint: docker: # specify the version you desire here - - image: cimg/node:14.17.6-browsers + - image: cimg/base:current # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images # documented at https://circleci.com/docs/2.0/circleci-images/ - resource_class: xlarge + resource_class: + xlarge # - image: circleci/mongo:3.4.4 environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" @@ -62,6 +67,9 @@ jobs: parallelism: 35 steps: - checkout + - node/install: + install-yarn: true + node-version: "v14.17.6" - restore_cache: keys: - v1-deps-{{ checksum "yarn.lock" }} @@ -72,12 +80,13 @@ jobs: remix-libs: docker: # specify the version you desire here - - image: cimg/node:14.17.6-browsers + - image: cimg/base:current # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images # documented at https://circleci.com/docs/2.0/circleci-images/ - resource_class: xlarge + resource_class: + xlarge # - image: circleci/mongo:3.4.4 environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" @@ -86,8 +95,11 @@ jobs: steps: - checkout + - node/install: + install-yarn: true + node-version: "v14.17.6" - attach_workspace: - at: . + at: . - run: unzip ./persist/dist.zip - restore_cache: keys: @@ -95,16 +107,17 @@ jobs: - run: yarn install - run: cd dist/libs/remix-tests && yarn install - run: yarn run test:libs - + remix-ide-chrome: docker: # specify the version you desire here - - image: cimg/node:14.17.6-browsers + - image: cimg/base:current # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images # documented at https://circleci.com/docs/2.0/circleci-images/ - resource_class: xlarge + resource_class: + xlarge # - image: circleci/mongo:3.4.4 environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" @@ -113,17 +126,20 @@ jobs: parallelism: 90 steps: + - node/install: + install-yarn: true + node-version: "v14.17.6" - browser-tools/install-chrome - browser-tools/install-chromedriver - run: command: | - google-chrome --version - chromedriver --version - java -jar /usr/local/bin/selenium.jar --version + google-chrome --version + chromedriver --version + java -jar /usr/local/bin/selenium.jar --version name: Check install - checkout - attach_workspace: - at: . + at: . - run: unzip ./persist/dist.zip - restore_cache: keys: @@ -142,12 +158,13 @@ jobs: flaky-chrome: docker: # specify the version you desire here - - image: cimg/node:14.17.6-browsers + - image: cimg/base:current # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images # documented at https://circleci.com/docs/2.0/circleci-images/ - resource_class: xlarge + resource_class: + xlarge # - image: circleci/mongo:3.4.4 environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" @@ -156,17 +173,20 @@ jobs: parallelism: 80 steps: + - node/install: + install-yarn: true + node-version: "v14.17.6" - browser-tools/install-chrome - browser-tools/install-chromedriver - run: command: | - google-chrome --version - chromedriver --version - java -jar /usr/local/bin/selenium.jar --version + google-chrome --version + chromedriver --version + java -jar /usr/local/bin/selenium.jar --version name: Check install - checkout - attach_workspace: - at: . + at: . - run: unzip ./persist/dist.zip - restore_cache: keys: @@ -185,12 +205,13 @@ jobs: remix-ide-firefox: docker: # specify the version you desire here - - image: cimg/node:14.17.6-browsers + - image: cimg/base:current # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images # documented at https://circleci.com/docs/2.0/circleci-images/ - resource_class: xlarge + resource_class: + xlarge # - image: circleci/mongo:3.4.4 environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" @@ -199,17 +220,20 @@ jobs: parallelism: 90 steps: + - node/install: + install-yarn: true + node-version: "v14.17.6" - browser-tools/install-firefox - browser-tools/install-geckodriver - run: command: | - firefox --version - geckodriver --version - java -jar /usr/local/bin/selenium.jar --version + firefox --version + geckodriver --version + java -jar /usr/local/bin/selenium.jar --version name: Check install - checkout - attach_workspace: - at: . + at: . - run: unzip ./persist/dist.zip - restore_cache: keys: @@ -227,12 +251,13 @@ jobs: flaky-firefox: docker: # specify the version you desire here - - image: cimg/node:14.17.6-browsers + - image: cimg/base:current # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images # documented at https://circleci.com/docs/2.0/circleci-images/ - resource_class: xlarge + resource_class: + xlarge # - image: circleci/mongo:3.4.4 environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" @@ -241,17 +266,20 @@ jobs: parallelism: 80 steps: + - node/install: + install-yarn: true + node-version: "v14.17.6" - browser-tools/install-firefox - browser-tools/install-geckodriver - run: command: | - firefox --version - geckodriver --version - java -jar /usr/local/bin/selenium.jar --version + firefox --version + geckodriver --version + java -jar /usr/local/bin/selenium.jar --version name: Check install - checkout - attach_workspace: - at: . + at: . - run: unzip ./persist/dist.zip - restore_cache: keys: @@ -270,12 +298,13 @@ jobs: remix-ide-vyper-plugin: docker: # specify the version you desire here - - image: cimg/node:14.17.6-browsers + - image: cimg/base:current # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images # documented at https://circleci.com/docs/2.0/circleci-images/ - resource_class: xlarge + resource_class: + xlarge # - image: circleci/mongo:3.4.4 environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" @@ -283,18 +312,20 @@ jobs: working_directory: ~/remix-project parallelism: 10 steps: + - node/install: + install-yarn: true + node-version: "v14.17.6" - browser-tools/install-chrome - browser-tools/install-chromedriver - run: command: | - google-chrome --version - chromedriver --version - java -jar /usr/local/bin/selenium.jar --version + google-chrome --version + chromedriver --version + java -jar /usr/local/bin/selenium.jar --version name: Check install - checkout - - checkout - attach_workspace: - at: . + at: . - run: unzip ./persist/dist.zip - restore_cache: keys: @@ -314,12 +345,13 @@ jobs: remix-ide-etherscan-plugin: docker: # specify the version you desire here - - image: cimg/node:14.17.6-browsers + - image: cimg/base:current # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images # documented at https://circleci.com/docs/2.0/circleci-images/ - resource_class: xlarge + resource_class: + xlarge # - image: circleci/mongo:3.4.4 environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" @@ -327,18 +359,20 @@ jobs: working_directory: ~/remix-project parallelism: 10 steps: + - node/install: + install-yarn: true + node-version: "v14.17.6" - browser-tools/install-chrome - browser-tools/install-chromedriver - run: command: | - google-chrome --version - chromedriver --version - java -jar /usr/local/bin/selenium.jar --version + google-chrome --version + chromedriver --version + java -jar /usr/local/bin/selenium.jar --version name: Check install - checkout - - checkout - attach_workspace: - at: . + at: . - run: unzip ./persist/dist.zip - restore_cache: keys: @@ -354,16 +388,17 @@ jobs: path: ./reports/tests - store_artifacts: path: ./reports/screenshots - + remix-ide-plugin-api: docker: # specify the version you desire here - - image: cimg/node:14.17.6-browsers + - image: cimg/base:current # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images # documented at https://circleci.com/docs/2.0/circleci-images/ - resource_class: xlarge + resource_class: + xlarge # - image: circleci/mongo:3.4.4 environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" @@ -371,18 +406,20 @@ jobs: working_directory: ~/remix-project parallelism: 10 steps: + - node/install: + install-yarn: true + node-version: "v14.17.6" - browser-tools/install-chrome - browser-tools/install-chromedriver - run: command: | - google-chrome --version - chromedriver --version - java -jar /usr/local/bin/selenium.jar --version + google-chrome --version + chromedriver --version + java -jar /usr/local/bin/selenium.jar --version name: Check install - checkout - - checkout - attach_workspace: - at: . + at: . - run: unzip ./persist/dist.zip - restore_cache: keys: @@ -401,12 +438,13 @@ jobs: deploy-remix-live: docker: # specify the version you desire here - - image: cimg/node:14.17.6-browsers + - image: cimg/base:current # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images # documented at https://circleci.com/docs/2.0/circleci-images/ - resource_class: xlarge + resource_class: + xlarge # - image: circleci/mongo:3.4.4 environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" @@ -415,26 +453,29 @@ jobs: working_directory: ~/remix-project steps: + - node/install: + install-yarn: true + node-version: "v14.17.6" - checkout - run: yarn install - run: yarn run downloadsolc_assets - run: yarn run build:production - - run: + - run: name: Deploy command: | if [ "${CIRCLE_BRANCH}" == "remix_live" ]; then ./apps/remix-ide/ci/deploy_from_travis_remix-live.sh; fi - deploy-remix-alpha: docker: # specify the version you desire here - - image: cimg/node:14.17.6-browsers + - image: cimg/base:current # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images - resource_class: xlarge + resource_class: + xlarge # documented at https://circleci.com/docs/2.0/circleci-images/ # - image: circleci/mongo:3.4.4 environment: @@ -448,7 +489,7 @@ jobs: - run: yarn install - run: yarn run downloadsolc_assets - run: yarn run build:production - - run: + - run: name: Deploy command: | if [ "${CIRCLE_BRANCH}" == "master" ]; then @@ -458,11 +499,12 @@ jobs: deploy-remix-beta: docker: # specify the version you desire here - - image: cimg/node:14.17.6-browsers + - image: cimg/base:current # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images - resource_class: xlarge + resource_class: + xlarge # documented at https://circleci.com/docs/2.0/circleci-images/ # - image: circleci/mongo:3.4.4 environment: @@ -473,11 +515,14 @@ jobs: steps: - checkout + - node/install: + install-yarn: true + node-version: "v14.17.6" - run: yarn install - run: yarn run build:libs - run: yarn run downloadsolc_assets - run: yarn run build:production - - run: + - run: name: Deploy command: | if [ "${CIRCLE_BRANCH}" == "remix_beta" ]; then @@ -520,7 +565,7 @@ workflows: - remix-ide-firefox: requires: - build - - deploy-remix-live: + - deploy-remix-live: requires: - lint - remix-libs @@ -532,7 +577,7 @@ workflows: filters: branches: only: remix_live - - deploy-remix-alpha: + - deploy-remix-alpha: requires: - lint - remix-libs @@ -544,7 +589,7 @@ workflows: filters: branches: only: master - - deploy-remix-beta: + - deploy-remix-beta: requires: - lint - remix-libs @@ -556,4 +601,3 @@ workflows: filters: branches: only: remix_beta - From 6022414ff1ab083f4bcee03866ebabc0dd009b88 Mon Sep 17 00:00:00 2001 From: filip mertens Date: Thu, 15 Sep 2022 12:55:53 +0200 Subject: [PATCH 03/14] selenium --- .circleci/config.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 40e5e6d954..80951d5664 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -135,7 +135,6 @@ jobs: command: | google-chrome --version chromedriver --version - java -jar /usr/local/bin/selenium.jar --version name: Check install - checkout - attach_workspace: @@ -146,9 +145,11 @@ jobs: - v1-deps-{{ checksum "yarn.lock" }} - run: yarn install - run: - name: Start Selenium - command: java -jar /usr/local/bin/selenium.jar - background: true + name: Install Selenium + command: yarn run selenium-install + - run: + name: Run Selenium + command: yarn run selenium - run: ./apps/remix-ide/ci/browser_test.sh chrome - store_test_results: path: ./reports/tests From 598f58a1efe287703a1a24afbad8137490a27b65 Mon Sep 17 00:00:00 2001 From: filip mertens Date: Thu, 15 Sep 2022 13:03:31 +0200 Subject: [PATCH 04/14] java --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 80951d5664..431011757f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -144,6 +144,9 @@ jobs: keys: - v1-deps-{{ checksum "yarn.lock" }} - run: yarn install + - run: + name: Java + command: sudo apt install default-jre - run: name: Install Selenium command: yarn run selenium-install From 28eb450fae02ba85ffbb5b8e7295b873b567fef3 Mon Sep 17 00:00:00 2001 From: filip mertens Date: Thu, 15 Sep 2022 13:04:16 +0200 Subject: [PATCH 05/14] java --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 431011757f..671cd3655f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,6 +31,9 @@ jobs: - node/install: install-yarn: true node-version: "v14.17.6" + - run: + name: Java + command: sudo apt install default-jre - restore_cache: keys: - v1-deps-{{ checksum "yarn.lock" }} From 8ca1fef93f2e22d386a9f76f148654e6eace98c9 Mon Sep 17 00:00:00 2001 From: filip mertens Date: Thu, 15 Sep 2022 13:05:09 +0200 Subject: [PATCH 06/14] java2 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 671cd3655f..c61903c9ed 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,7 +33,7 @@ jobs: node-version: "v14.17.6" - run: name: Java - command: sudo apt install default-jre + command: sudo apt update && sudo apt install default-jre - restore_cache: keys: - v1-deps-{{ checksum "yarn.lock" }} From 57128c26f9cd224abbcd8acf6102780335794a0d Mon Sep 17 00:00:00 2001 From: filip mertens Date: Thu, 15 Sep 2022 13:06:43 +0200 Subject: [PATCH 07/14] java --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c61903c9ed..b572eb86e6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -149,7 +149,7 @@ jobs: - run: yarn install - run: name: Java - command: sudo apt install default-jre + command: sudo apt update && sudo apt install default-jre - run: name: Install Selenium command: yarn run selenium-install From 5bd248059593f04b3ea1cbbcc7ae1363f1bc0eea Mon Sep 17 00:00:00 2001 From: filip mertens Date: Thu, 15 Sep 2022 13:11:55 +0200 Subject: [PATCH 08/14] background --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b572eb86e6..72e8118adc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,9 +31,6 @@ jobs: - node/install: install-yarn: true node-version: "v14.17.6" - - run: - name: Java - command: sudo apt update && sudo apt install default-jre - restore_cache: keys: - v1-deps-{{ checksum "yarn.lock" }} @@ -156,6 +153,7 @@ jobs: - run: name: Run Selenium command: yarn run selenium + background: true - run: ./apps/remix-ide/ci/browser_test.sh chrome - store_test_results: path: ./reports/tests From db9e9a0e801d376ffd905419b1a7144d796da3ad Mon Sep 17 00:00:00 2001 From: filip mertens Date: Thu, 15 Sep 2022 13:20:52 +0200 Subject: [PATCH 09/14] update all --- .circleci/config.yml | 71 +++++++++++++++++++++++++++++++++----------- 1 file changed, 53 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 72e8118adc..3a46c85a85 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -187,7 +187,6 @@ jobs: command: | google-chrome --version chromedriver --version - java -jar /usr/local/bin/selenium.jar --version name: Check install - checkout - attach_workspace: @@ -197,9 +196,15 @@ jobs: keys: - v1-deps-{{ checksum "yarn.lock" }} - run: yarn install + - run: + name: Java + command: sudo apt update && sudo apt install default-jre - run: - name: Start Selenium - command: java -jar /usr/local/bin/selenium.jar + name: Install Selenium + command: yarn run selenium-install + - run: + name: Run Selenium + command: yarn run selenium background: true - run: ./apps/remix-ide/ci/flaky.sh chrome - store_test_results: @@ -234,7 +239,7 @@ jobs: command: | firefox --version geckodriver --version - java -jar /usr/local/bin/selenium.jar --version + name: Check install - checkout - attach_workspace: @@ -244,9 +249,15 @@ jobs: keys: - v1-deps-{{ checksum "yarn.lock" }} - run: yarn install + - run: + name: Java + command: sudo apt update && sudo apt install default-jre - run: - name: Start Selenium - command: java -jar /usr/local/bin/selenium.jar + name: Install Selenium + command: yarn run selenium-install + - run: + name: Run Selenium + command: yarn run selenium background: true - run: ./apps/remix-ide/ci/browser_test.sh firefox - store_test_results: @@ -280,7 +291,7 @@ jobs: command: | firefox --version geckodriver --version - java -jar /usr/local/bin/selenium.jar --version + name: Check install - checkout - attach_workspace: @@ -290,9 +301,15 @@ jobs: keys: - v1-deps-{{ checksum "yarn.lock" }} - run: yarn install + - run: + name: Java + command: sudo apt update && sudo apt install default-jre - run: - name: Start Selenium - command: java -jar /usr/local/bin/selenium.jar + name: Install Selenium + command: yarn run selenium-install + - run: + name: Run Selenium + command: yarn run selenium background: true - run: ./apps/remix-ide/ci/flaky.sh firefox - store_test_results: @@ -326,7 +343,7 @@ jobs: command: | google-chrome --version chromedriver --version - java -jar /usr/local/bin/selenium.jar --version + name: Check install - checkout - attach_workspace: @@ -336,9 +353,15 @@ jobs: keys: - v1-deps-{{ checksum "yarn.lock" }} - run: yarn install + - run: + name: Java + command: sudo apt update && sudo apt install default-jre - run: - name: Start Selenium - command: java -jar /usr/local/bin/selenium.jar + name: Install Selenium + command: yarn run selenium-install + - run: + name: Run Selenium + command: yarn run selenium background: true - run: npx nx build vyper - run: ./apps/remix-ide/ci/browser_tests_vyper_plugin.sh @@ -373,7 +396,7 @@ jobs: command: | google-chrome --version chromedriver --version - java -jar /usr/local/bin/selenium.jar --version + name: Check install - checkout - attach_workspace: @@ -383,9 +406,15 @@ jobs: keys: - v1-deps-{{ checksum "yarn.lock" }} - run: yarn install + - run: + name: Java + command: sudo apt update && sudo apt install default-jre + - run: + name: Install Selenium + command: yarn run selenium-install - run: - name: Start Selenium - command: java -jar /usr/local/bin/selenium.jar + name: Run Selenium + command: yarn run selenium background: true - run: npx nx build etherscan - run: ./apps/remix-ide/ci/browser_tests_etherscan_plugin.sh @@ -420,7 +449,7 @@ jobs: command: | google-chrome --version chromedriver --version - java -jar /usr/local/bin/selenium.jar --version + name: Check install - checkout - attach_workspace: @@ -430,9 +459,15 @@ jobs: keys: - v1-deps-{{ checksum "yarn.lock" }} - run: yarn install + - run: + name: Java + command: sudo apt update && sudo apt install default-jre + - run: + name: Install Selenium + command: yarn run selenium-install - run: - name: Start Selenium - command: java -jar /usr/local/bin/selenium.jar + name: Run Selenium + command: yarn run selenium background: true - run: ./apps/remix-ide/ci/browser_tests_plugin_api.sh - store_test_results: From d6831f593af627804878b9e53d332d28eb5b0ebe Mon Sep 17 00:00:00 2001 From: filip mertens Date: Thu, 15 Sep 2022 13:50:42 +0200 Subject: [PATCH 10/14] increase para --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3a46c85a85..de5701a763 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -176,7 +176,7 @@ jobs: - COMMIT_AUTHOR: "Circle CI" working_directory: ~/remix-project - parallelism: 80 + parallelism: 95 steps: - node/install: install-yarn: true @@ -228,7 +228,7 @@ jobs: - COMMIT_AUTHOR: "Circle CI" working_directory: ~/remix-project - parallelism: 90 + parallelism: 95 steps: - node/install: install-yarn: true @@ -280,7 +280,7 @@ jobs: - COMMIT_AUTHOR: "Circle CI" working_directory: ~/remix-project - parallelism: 80 + parallelism: 95 steps: - node/install: install-yarn: true From 15c8e6a0cb12890462047793613cf80c229a2297 Mon Sep 17 00:00:00 2001 From: filip mertens Date: Thu, 15 Sep 2022 13:56:58 +0200 Subject: [PATCH 11/14] para --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index de5701a763..ef73a52a0d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -124,7 +124,7 @@ jobs: - COMMIT_AUTHOR: "Circle CI" working_directory: ~/remix-project - parallelism: 90 + parallelism: 95 steps: - node/install: install-yarn: true From 6cc79ab7eab10dc876e074222f3c0c16faf83705 Mon Sep 17 00:00:00 2001 From: filip mertens Date: Thu, 15 Sep 2022 14:10:33 +0200 Subject: [PATCH 12/14] update selenium --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f02f9a5b52..cb6a863b2b 100644 --- a/package.json +++ b/package.json @@ -324,7 +324,7 @@ "onchange": "^3.2.1", "request": "^2.83.0", "rimraf": "^2.6.1", - "selenium-standalone": "^8.0.4", + "selenium-standalone": "^8.2.0", "semver": "^6.3.0", "solc": "0.7.4", "tap-spec": "^5.0.0", From 49311cac43d380b207467e1941af4c7d6cb8f32a Mon Sep 17 00:00:00 2001 From: filip mertens Date: Thu, 15 Sep 2022 14:28:12 +0200 Subject: [PATCH 13/14] revert --- .circleci/config.yml | 28 ++++++++++++++-------------- package.json | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ef73a52a0d..e308cf5191 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,7 +34,7 @@ jobs: - restore_cache: keys: - v1-deps-{{ checksum "yarn.lock" }} - - run: yarn install + - run: yarn - save_cache: key: v1-deps-{{ checksum "yarn.lock" }} paths: @@ -73,7 +73,7 @@ jobs: - restore_cache: keys: - v1-deps-{{ checksum "yarn.lock" }} - - run: yarn install + - run: yarn - run: name: Remix Libs Linting command: ./apps/remix-ide/ci/lint.sh @@ -104,8 +104,8 @@ jobs: - restore_cache: keys: - v1-deps-{{ checksum "yarn.lock" }} - - run: yarn install - - run: cd dist/libs/remix-tests && yarn install + - run: yarn + - run: cd dist/libs/remix-tests && yarn - run: yarn run test:libs remix-ide-chrome: @@ -143,7 +143,7 @@ jobs: - restore_cache: keys: - v1-deps-{{ checksum "yarn.lock" }} - - run: yarn install + - run: yarn - run: name: Java command: sudo apt update && sudo apt install default-jre @@ -195,7 +195,7 @@ jobs: - restore_cache: keys: - v1-deps-{{ checksum "yarn.lock" }} - - run: yarn install + - run: yarn - run: name: Java command: sudo apt update && sudo apt install default-jre @@ -248,7 +248,7 @@ jobs: - restore_cache: keys: - v1-deps-{{ checksum "yarn.lock" }} - - run: yarn install + - run: yarn - run: name: Java command: sudo apt update && sudo apt install default-jre @@ -300,7 +300,7 @@ jobs: - restore_cache: keys: - v1-deps-{{ checksum "yarn.lock" }} - - run: yarn install + - run: yarn - run: name: Java command: sudo apt update && sudo apt install default-jre @@ -352,7 +352,7 @@ jobs: - restore_cache: keys: - v1-deps-{{ checksum "yarn.lock" }} - - run: yarn install + - run: yarn - run: name: Java command: sudo apt update && sudo apt install default-jre @@ -405,7 +405,7 @@ jobs: - restore_cache: keys: - v1-deps-{{ checksum "yarn.lock" }} - - run: yarn install + - run: yarn - run: name: Java command: sudo apt update && sudo apt install default-jre @@ -458,7 +458,7 @@ jobs: - restore_cache: keys: - v1-deps-{{ checksum "yarn.lock" }} - - run: yarn install + - run: yarn - run: name: Java command: sudo apt update && sudo apt install default-jre @@ -497,7 +497,7 @@ jobs: install-yarn: true node-version: "v14.17.6" - checkout - - run: yarn install + - run: yarn - run: yarn run downloadsolc_assets - run: yarn run build:production - run: @@ -526,7 +526,7 @@ jobs: steps: - checkout - - run: yarn install + - run: yarn - run: yarn run downloadsolc_assets - run: yarn run build:production - run: @@ -558,7 +558,7 @@ jobs: - node/install: install-yarn: true node-version: "v14.17.6" - - run: yarn install + - run: yarn - run: yarn run build:libs - run: yarn run downloadsolc_assets - run: yarn run build:production diff --git a/package.json b/package.json index cb6a863b2b..f02f9a5b52 100644 --- a/package.json +++ b/package.json @@ -324,7 +324,7 @@ "onchange": "^3.2.1", "request": "^2.83.0", "rimraf": "^2.6.1", - "selenium-standalone": "^8.2.0", + "selenium-standalone": "^8.0.4", "semver": "^6.3.0", "solc": "0.7.4", "tap-spec": "^5.0.0", From 3d5d6f1a19ad4daccd60a527caf49d114e546099 Mon Sep 17 00:00:00 2001 From: filip mertens Date: Thu, 15 Sep 2022 14:30:36 +0200 Subject: [PATCH 14/14] lock --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index f02f9a5b52..cb6a863b2b 100644 --- a/package.json +++ b/package.json @@ -324,7 +324,7 @@ "onchange": "^3.2.1", "request": "^2.83.0", "rimraf": "^2.6.1", - "selenium-standalone": "^8.0.4", + "selenium-standalone": "^8.2.0", "semver": "^6.3.0", "solc": "0.7.4", "tap-spec": "^5.0.0", diff --git a/yarn.lock b/yarn.lock index 28e737473a..498e79f2a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8179,10 +8179,10 @@ commander@^7.2.0: resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== -commander@^8.3.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" - integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== +commander@^9.0.0: + version "9.4.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.0.tgz#bc4a40918fefe52e22450c111ecd6b7acce6f11c" + integrity sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw== commondir@^1.0.1: version "1.0.1" @@ -20884,12 +20884,12 @@ select-hose@^2.0.0: resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= -selenium-standalone@^8.0.4: - version "8.0.8" - resolved "https://registry.yarnpkg.com/selenium-standalone/-/selenium-standalone-8.0.8.tgz#15f8202d2fed2bcc9264c10f2a8da4f71f85b377" - integrity sha512-2NCHoK12dbLbtXPIdMe1ljiLAMflJDBezPhjJBwmnYz5/yGjCPv2R9ojHO6W1ctD9DOlqyi3AxoAvlT2nmB7Fw== +selenium-standalone@^8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/selenium-standalone/-/selenium-standalone-8.2.0.tgz#378b9740fe84953083fa9c0b1d8dcbfc3bd8508c" + integrity sha512-gRFJm2A91sL0/4PavIsfTVNjyqNjk+zbdJg/zAYgTMjuoWJv+BlYJh+1UbEtyjt4YvZACYif1DFAzFjQapqiOA== dependencies: - commander "^8.3.0" + commander "^9.0.0" cross-spawn "^7.0.3" debug "^4.3.1" fs-extra "^10.0.0"