Skip to content

Commit

Permalink
clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
seaona committed Jul 2, 2024
1 parent 3783ebf commit 726f86b
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 26 deletions.
44 changes: 19 additions & 25 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,13 @@ develop_master_rc_only: &develop_master_rc_only
- master
- /^Version-v(\d+)[.](\d+)[.](\d+)/

conditional-require-get-changed-files: &conditional-require-get-changed-files
requires:
- get-changed-files-with-git-diff
filters:
branches:
ignore:
- develop
- master
- /^Version-v(\d+)[.](\d+)[.](\d+)$/
develop_master_rc_excluded: &develop_master_rc_excluded
filters:
branches:
ignore:
- develop
- master
- /^Version-v(\d+)[.](\d+)[.](\d+)$/

aliases:
# Shallow Git Clone
Expand Down Expand Up @@ -116,12 +114,7 @@ workflows:
- check-pr-tag
- prep-deps
- get-changed-files-with-git-diff:
filters:
branches:
ignore:
- develop
- master
- /^Version-v(\d+)[.](\d+)[.](\d+)/
<<: *develop_master_rc_excluded
requires:
- prep-deps
- test-deps-audit:
Expand Down Expand Up @@ -204,53 +197,53 @@ workflows:
requires:
- prep-deps
- test-e2e-chrome:
<<: *conditional-require-get-changed-files
requires:
- prep-build-test
- get-changed-files-with-git-diff
- test-e2e-chrome-confirmation-redesign:
<<: *conditional-require-get-changed-files
requires:
- prep-build-confirmation-redesign-test
- get-changed-files-with-git-diff
- test-e2e-firefox:
<<: *conditional-require-get-changed-files
requires:
- prep-build-test-mv2
- get-changed-files-with-git-diff
- test-e2e-firefox-confirmation-redesign:
<<: *develop_master_rc_only
<<: *conditional-require-get-changed-files
requires:
- prep-build-confirmation-redesign-test-mv2
- get-changed-files-with-git-diff
- test-e2e-chrome-rpc:
<<: *conditional-require-get-changed-files
requires:
- prep-build-test
- get-changed-files-with-git-diff
- test-api-specs:
requires:
- prep-build-test
- test-e2e-chrome-multiple-providers:
<<: *conditional-require-get-changed-files
requires:
- prep-build-test
- get-changed-files-with-git-diff
- test-e2e-chrome-flask:
<<: *conditional-require-get-changed-files
requires:
- prep-build-test-flask
- get-changed-files-with-git-diff
- test-e2e-firefox-flask:
<<: *develop_master_rc_only
<<: *conditional-require-get-changed-files
requires:
- prep-build-test-flask-mv2
- get-changed-files-with-git-diff
- test-e2e-chrome-mmi:
<<: *conditional-require-get-changed-files
requires:
- prep-build-test-mmi
- get-changed-files-with-git-diff
- test-e2e-mmi-playwright - OPTIONAL:
requires:
- prep-build-test-mmi-playwright
- test-e2e-chrome-rpc-mmi:
<<: *conditional-require-get-changed-files
requires:
- prep-build-test-mmi
- get-changed-files-with-git-diff
- test-e2e-chrome-vault-decryption:
filters:
branches:
Expand Down Expand Up @@ -503,6 +496,7 @@ jobs:

# This job is used for the e2e quality gate.
# It must be run before any job which uses the run-all.js script.
# The job is skipped in develop, master or RC branches.
get-changed-files-with-git-diff:
executor: node-browsers-small
steps:
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/changedFilesUtil.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ async function readChangedFiles() {
return changedFiles;
} catch (error) {
console.error('Error reading from file:', error);
return [''];
return [];
}
}

Expand Down

0 comments on commit 726f86b

Please sign in to comment.