Skip to content

Commit ddb4476

Browse files
committed
file pattern
1 parent 622d4d9 commit ddb4476

File tree

2 files changed

+33
-13
lines changed

2 files changed

+33
-13
lines changed

.circleci/config.yml

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -758,25 +758,25 @@ jobs:
758758
- image: cimg/node:24.3.0
759759
working_directory: ~/remix-project
760760
parameters:
761-
tag:
761+
pattern:
762762
type: string
763763
steps:
764764
- checkout
765765
- run: node apps/remix-ide-e2e/src/buildGroupTests.js
766766
- run:
767767
name: Check for enabled tests matching tag
768768
command: |
769-
TAG="<< parameters.tag >>"
770-
if [ -z "$TAG" ]; then
769+
PATTERN="<< parameters.pattern >>"
770+
if [ -z "$PATTERN" ]; then
771771
echo "❌ Tag parameter is empty!"
772772
exit 2
773773
fi
774-
echo "🔍 Searching for enabled tests with .$TAG extension..."
775-
if grep -IRiL "'@disabled': \?true" "./apps/remix-ide-e2e/src/tests" | grep "\.${TAG}"; then
776-
echo "✅ Found enabled .$TAG tests."
774+
echo "🔍 Searching for enabled tests with .$PATTERN extension..."
775+
if grep -IRiL "'@disabled': \?true" "./apps/remix-ide-e2e/src/tests" | grep "${PATTEN}"; then
776+
echo "✅ Found enabled .$PATTERN tests."
777777
exit 0
778778
else
779-
echo "⚠️ No enabled .$TAG tests found. Skipping workflow."
779+
echo "⚠️ No enabled .$PATTERN tests found. Skipping workflow."
780780
exit 1
781781
fi
782782
@@ -1006,11 +1006,31 @@ workflows:
10061006
- build-remixdesktop-linux
10071007
- test-remixdesktop-linux
10081008

1009+
run_file_tests:
1010+
when: << pipeline.parameters.run_file_tests >>
1011+
jobs:
1012+
- check-flaky-or-pr-tests:
1013+
pattern: << pipeline.parameters.run_file_tests >>
1014+
- build:
1015+
requires:
1016+
- check-flaky-or-pr-tests
1017+
- remix-ide-browser:
1018+
requires:
1019+
- build
1020+
matrix:
1021+
parameters:
1022+
browser: ["chrome"]
1023+
script: ["singletest.sh"]
1024+
job: ["nogroup"]
1025+
jobsize: ["1"]
1026+
parallelism: [1]
1027+
scriptparameter: [<< pipeline.parameters.run_file_tests >>]
1028+
10091029
run_pr_tests:
10101030
when: << pipeline.parameters.run_pr_tests >>
10111031
jobs:
10121032
- check-flaky-or-pr-tests:
1013-
tag: "pr"
1033+
pattern: "\\.pr"
10141034
- build:
10151035
requires:
10161036
- check-flaky-or-pr-tests
@@ -1024,13 +1044,13 @@ workflows:
10241044
job: ["nogroup"]
10251045
jobsize: ["1"]
10261046
parallelism: [1]
1027-
scriptparameter: ["pr"]
1047+
scriptparameter: ["\\.pr"]
10281048

10291049
run_flaky_tests:
10301050
when: << pipeline.parameters.run_flaky_tests >>
10311051
jobs:
10321052
- check-flaky-or-pr-tests:
1033-
tag: "flaky"
1053+
pattern: "\\.flaky"
10341054
- build:
10351055
requires:
10361056
- check-flaky-or-pr-tests
@@ -1044,7 +1064,7 @@ workflows:
10441064
job: ["nogroup"]
10451065
jobsize: ["1"]
10461066
parallelism: [5]
1047-
scriptparameter: ["flaky"]
1067+
scriptparameter: ["\\.flaky"]
10481068

10491069
run_metamask_tests:
10501070
when: << pipeline.parameters.run_metamask_tests >>

apps/remix-ide/ci/singletest.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
set -e
44

5-
TESTFILES=$(grep -IRiL "\'@disabled\': \?true" "dist/apps/remix-ide-e2e/src/tests" | grep "\.${4}" | sort )
5+
TESTFILES=$(grep -IRiL "\'@disabled\': \?true" "dist/apps/remix-ide-e2e/src/tests" | grep "${4}" | sort )
66

77
# count test files
8-
fileCount=$(grep -IRiL "\'@disabled\': \?true" "dist/apps/remix-ide-e2e/src/tests" | grep "\.${4}" | wc -l )
8+
fileCount=$(grep -IRiL "\'@disabled\': \?true" "dist/apps/remix-ide-e2e/src/tests" | grep "${4}" | wc -l )
99
# if fileCount is 0
1010
if [ $fileCount -eq 0 ]
1111
then

0 commit comments

Comments
 (0)