Skip to content

Commit 4589b16

Browse files
kgrytekgryte
committed
Explicitly test for folder name
1 parent 851f0be commit 4589b16

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎tools/git/hooks/pre-commit‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ run_lint() {
9999
fi
100100

101101
# Lint JavaScript source files...
102-
files=$(echo "${changed_files}" | grep '\.js$' | grep -v -e 'examples' -e 'test' -e 'benchmark' -e '^dist/' | tr '\n' ' ')
102+
files=$(echo "${changed_files}" | grep '\.js$' | grep -v -e '/examples' -e '/test' -e '/benchmark' -e '^dist/' | tr '\n' ' ')
103103
if [[ -n "${files}" ]]; then
104104
make FILES="${files}" lint-javascript-files > /dev/null >&2
105105
if [[ "$?" -ne 0 ]]; then
@@ -110,7 +110,7 @@ run_lint() {
110110
fi
111111

112112
# Lint JavaScript command-line interfaces...
113-
files=$(echo "${changed_files}" | grep '\/bin\/cli$' | tr '\n' ' ')
113+
files=$(echo "${changed_files}" | grep '/bin/cli$' | tr '\n' ' ')
114114
if [[ -n "${files}" ]]; then
115115
make FILES="${files}" lint-javascript-files > /dev/null >&2
116116
if [[ "$?" -ne 0 ]]; then
@@ -132,7 +132,7 @@ run_lint() {
132132
fi
133133

134134
# Lint JavaScript test files...
135-
files=$(echo "${changed_files}" | grep 'test/.*\.js$' | tr '\n' ' ')
135+
files=$(echo "${changed_files}" | grep '/test/.*\.js$' | tr '\n' ' ')
136136
if [[ -n "${files}" ]]; then
137137
make JAVASCRIPT_LINTER=eslint ESLINT_CONF="${eslint_tests_conf}" FILES="${files}" lint-javascript-files > /dev/null >&2
138138
if [[ "$?" -ne 0 ]]; then
@@ -143,7 +143,7 @@ run_lint() {
143143
fi
144144

145145
# Lint JavaScript benchmark files...
146-
files=$(echo "${changed_files}" | grep 'benchmark/.*\.js$' | tr '\n' ' ')
146+
files=$(echo "${changed_files}" | grep '/benchmark/.*\.js$' | tr '\n' ' ')
147147
if [[ -n "${files}" ]]; then
148148
make JAVASCRIPT_LINTER=eslint ESLINT_CONF="${eslint_benchmarks_conf}" FILES="${files}" lint-javascript-files > /dev/null >&2
149149
if [[ "$?" -ne 0 ]]; then

‎tools/git/hooks/pre-push‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ main() {
130130
# TODO: run CLI examples found in Markdown files
131131

132132
# Run C benchmark files...
133-
files=$(echo "${changed_files}" | grep 'benchmark/.*\.c$' | tr '\n' ' ')
133+
files=$(echo "${changed_files}" | grep '/benchmark/.*\.c$' | tr '\n' ' ')
134134
if [[ -n "${files}" ]]; then
135135
echo 'Running C benchmark files...' >&2
136136
make FILES="${files}" benchmark-c-files > /dev/null >&2
@@ -142,7 +142,7 @@ main() {
142142
fi
143143

144144
# Run C++ benchmark files...
145-
files=$(echo "${changed_files}" | grep 'benchmark/.*\.cpp$' | tr '\n' ' ')
145+
files=$(echo "${changed_files}" | grep '/benchmark/.*\.cpp$' | tr '\n' ' ')
146146
if [[ -n "${files}" ]]; then
147147
echo 'Running C++ benchmark files...' >&2
148148
make FILES="${files}" benchmark-cpp-files > /dev/null >&2
@@ -154,7 +154,7 @@ main() {
154154
fi
155155

156156
# Run Fortran benchmark files...
157-
files=$(echo "${changed_files}" | grep 'benchmark/.*\.f$' | tr '\n' ' ')
157+
files=$(echo "${changed_files}" | grep '/benchmark/.*\.f$' | tr '\n' ' ')
158158
if [[ -n "${files}" ]]; then
159159
echo 'Running Fortran benchmark files...' >&2
160160
make FILES="${files}" benchmark-fortran-files > /dev/null >&2
@@ -166,7 +166,7 @@ main() {
166166
fi
167167

168168
# Run JavaScript benchmark files...
169-
files=$(echo "${changed_files}" | grep 'benchmark/.*\.js$' | tr '\n' ' ')
169+
files=$(echo "${changed_files}" | grep '/benchmark/.*\.js$' | tr '\n' ' ')
170170
if [[ -n "${files}" ]]; then
171171
echo 'Running JavaScript benchmark files...' >&2
172172
make FILES="${files}" benchmark-javascript-files > /dev/null >&2
@@ -178,7 +178,7 @@ main() {
178178
fi
179179

180180
# Run Julia benchmark files...
181-
files=$(echo "${changed_files}" | grep 'benchmark/.*\.jl$' | tr '\n' ' ')
181+
files=$(echo "${changed_files}" | grep '/benchmark/.*\.jl$' | tr '\n' ' ')
182182
if [[ -n "${files}" ]]; then
183183
echo 'Running Julia benchmark files...' >&2
184184
make FILES="${files}" benchmark-julia-files > /dev/null >&2
@@ -190,7 +190,7 @@ main() {
190190
fi
191191

192192
# Run Python benchmark files...
193-
files=$(echo "${changed_files}" | grep 'benchmark/.*\.py$' | tr '\n' ' ')
193+
files=$(echo "${changed_files}" | grep '/benchmark/.*\.py$' | tr '\n' ' ')
194194
if [[ -n "${files}" ]]; then
195195
echo 'Running Python benchmark files...' >&2
196196
make FILES="${files}" benchmark-python-files > /dev/null >&2
@@ -202,7 +202,7 @@ main() {
202202
fi
203203

204204
# Run R benchmark files...
205-
files=$(echo "${changed_files}" | grep 'benchmark/.*\.R$' | tr '\n' ' ')
205+
files=$(echo "${changed_files}" | grep '/benchmark/.*\.R$' | tr '\n' ' ')
206206
if [[ -n "${files}" ]]; then
207207
echo 'Running R benchmark files...' >&2
208208
make FILES="${files}" benchmark-r-files > /dev/null >&2

0 commit comments

Comments
 (0)