From c2cc939f21c8e8039a2edf55dc008e53e7979010 Mon Sep 17 00:00:00 2001 From: filip mertens Date: Wed, 21 Sep 2022 09:21:11 +0200 Subject: [PATCH] rename stuff --- .circleci/config.yml | 14 +++++++------- apps/remix-ide/ci/splice_tests.js | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e424969d0f..10197c3f8a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -77,9 +77,9 @@ jobs: type: string script: type: string - group: + job: type: string - groupsize: + jobsize: type: string parallelism: 10 steps: @@ -111,7 +111,7 @@ jobs: name: Start Selenium command: java -jar /usr/local/bin/selenium.jar background: true - - run: ./apps/remix-ide/ci/<< parameters.script >> << parameters.browser >> << parameters.groupsize >> << parameters.group >> + - run: ./apps/remix-ide/ci/<< parameters.script >> << parameters.browser >> << parameters.jobsize >> << parameters.job >> - store_test_results: path: ./reports/tests - store_artifacts: @@ -248,8 +248,8 @@ workflows: parameters: browser: ["chrome", "firefox"] script: ["flaky.sh"] - group: ["nogroup"] - groupsize: ["1"] + job: ["nogroup"] + jobsize: ["1"] build_all: unless: << pipeline.parameters.run_flaky_tests >> jobs: @@ -273,8 +273,8 @@ workflows: parameters: browser: ["chrome", "firefox"] script: ["browser_test.sh"] - group: ["0","1","2","3","4","5","6","7","8","9"] - groupsize: ["10"] + job: ["0","1","2","3","4","5","6","7","8","9"] + jobsize: ["10"] - tests-passed: requires: - lint diff --git a/apps/remix-ide/ci/splice_tests.js b/apps/remix-ide/ci/splice_tests.js index 7e2e48f7ff..3a51c3eb0c 100644 --- a/apps/remix-ide/ci/splice_tests.js +++ b/apps/remix-ide/ci/splice_tests.js @@ -4,8 +4,8 @@ let cmd = `grep -IRiL "@disabled" "dist/apps/remix-ide-e2e/src/tests"` // get command line arguments let args = process.argv.slice(2) -const grouplength = args[0] || 10; -const group = args[1] || 0; +const jobsize = args[0] || 10; +const job = args[1] || 0; exec(cmd, (error, stdout, stderr) => { if (error) { console.error(`error: ${error.message}`); @@ -18,10 +18,10 @@ exec(cmd, (error, stdout, stderr) => { } let files = stdout.split('\n').filter(f => f.includes('.test')).map(f => f.replace('dist/apps/remix-ide-e2e/src/tests/', '')).map(f => f.replace('.js', '')) - let splitIndex = Math.ceil(files.length / grouplength); + let splitIndex = Math.ceil(files.length / jobsize); const parts = [] - for (let i = 0; i < grouplength; i++) { + for (let i = 0; i < jobsize; i++) { parts.push(files.slice(i * splitIndex, (i + 1) * splitIndex)) } - console.log(parts[group].join('\n')) + console.log(parts[job].join('\n')) });