diff --git a/.circleci/config.yml b/.circleci/config.yml index 8cc64a3831..3a41eadf9b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,7 +34,7 @@ jobs: fi - run: yarn run build:e2e - - run: grep -ir "soljson-v[0-9]" apps/* libs/* > soljson-versions.txt + - run: grep -ir "[0-9]+commit" apps/* libs/* --include \*.ts > soljson-versions.txt - restore_cache: keys: - soljson-cache-{{ checksum "soljson-versions.txt" }} diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js index 2f383c8e90..3ab69ffb34 100644 --- a/apps/remix-ide/ci/download_e2e_assets.js +++ b/apps/remix-ide/ci/download_e2e_assets.js @@ -3,7 +3,7 @@ const fs = require('fs'); var child_process = require('child_process'); const { exit } = require('process'); -var child = child_process.spawnSync('grep', ['-ir', '"soljson-v[0-9]"', 'libs/*', 'apps/*'], { encoding: 'utf8', cwd: process.cwd(), shell: true }); +var child = child_process.spawnSync('grep', ['-ir', '[0-9]+commit', 'libs/**/*', 'apps/**/*', '--include', '\*.ts'], { encoding: 'utf8', cwd: process.cwd(), shell: true }); if (child.error) { console.log("ERROR: ", child); @@ -17,6 +17,11 @@ if (soljson) { // filter out duplicates soljson = soljson.filter((item, index) => soljson.indexOf(item) === index); console.log('soljson versions found: ', soljson); + + // manually add some versions + soljson.push('soljson-v0.6.8+commit.0bbfe453.js'); + soljson.push('soljson-v0.6.0+commit.26b70077.js'); + for (let i = 0; i < soljson.length; i++) { const version = soljson[i]; if (version) { @@ -49,7 +54,8 @@ if (soljson) { } + + } - } }