Skip to content

Commit 51839e0

Browse files
MANDEep22332MANDEep22332
committed
Merge remote-tracking branch 'upstream/develop' into fix-lint-error
--- type: pre_commit_static_analysis_report description: Results of running static analysis checks when committing changes. report: - task: lint_filenames status: passed - task: lint_editorconfig status: passed - task: lint_markdown status: na - task: lint_package_json status: na - task: lint_repl_help status: na - task: lint_javascript_src status: na - task: lint_javascript_cli status: na - task: lint_javascript_examples status: passed - task: lint_javascript_tests status: na - task: lint_javascript_benchmarks status: na - task: lint_python status: na - task: lint_r status: na - task: lint_c_src status: na - task: lint_c_examples status: na - task: lint_c_benchmarks status: na - task: lint_c_tests_fixtures status: na - task: lint_shell status: na - task: lint_typescript_declarations status: passed - task: lint_typescript_tests status: na - task: lint_license_headers status: passed ---
2 parents bc2d455 + 23a6428 commit 51839e0

339 files changed

Lines changed: 2288 additions & 407 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/run_tests_coverage.yml‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ jobs:
228228
# Specify whether to remove untracked files before checking out the repository:
229229
clean: false
230230

231-
# Limit clone depth to the most recent commit:
232-
fetch-depth: 1
231+
# Fetch extra history so `git pull --rebase` can find a common ancestor:
232+
fetch-depth: 20
233233

234234
# Token for accessing the repository:
235235
token: ${{ secrets.STDLIB_BOT_FGPAT_REPO_READ }}
@@ -282,4 +282,22 @@ jobs:
282282
git config --local user.name "stdlib-bot"
283283
git add .
284284
git commit -m "Update artifacts" || exit 0
285-
git push "https://$USER_NAME:$REPO_GITHUB_TOKEN@github.com/stdlib-js/www-test-code-coverage.git" main
285+
286+
REMOTE_URL="https://$USER_NAME:$REPO_GITHUB_TOKEN@github.com/stdlib-js/www-test-code-coverage.git"
287+
MAX_ATTEMPTS=5
288+
for i in $(seq 1 $MAX_ATTEMPTS); do
289+
if git push "$REMOTE_URL" main; then
290+
echo "Push succeeded on attempt $i."
291+
break
292+
fi
293+
if [ "$i" -eq "$MAX_ATTEMPTS" ]; then
294+
echo "Push failed after $MAX_ATTEMPTS attempts."
295+
exit 1
296+
fi
297+
echo "Push failed on attempt $i. Pulling and retrying..."
298+
git pull --rebase "$REMOTE_URL" main || {
299+
echo "Rebase failed due to conflict. Falling back to merge..."
300+
git rebase --abort
301+
git pull --no-rebase "$REMOTE_URL" main
302+
}
303+
done

‎.github/workflows/scripts/run_affected_benchmarks/run‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
# LOG_FILE Log file.
3131
#
3232

33-
# shellcheck disable=SC2034,SC2153,SC2317
33+
# shellcheck disable=SC2034,SC2086,SC2153,SC2317
3434

3535
# Ensure that the exit status of pipelines is non-zero in the event that at least one of the commands in a pipeline fails:
3636
set -o pipefail
@@ -141,7 +141,8 @@ main() {
141141

142142
# Run JS benchmarks:
143143
if [ -n "${js_bench_files}" ]; then
144-
make benchmark-javascript-files FILES="${js_bench_files}"
144+
# Invoke make in batches to avoid "Argument list too long" errors:
145+
printf '%s\n' ${js_bench_files} | xargs sh -c 'make benchmark-javascript-files FILES="$*"' _
145146
else
146147
echo 'No JavaScript benchmarks to run.' >&2
147148
fi
@@ -172,7 +173,8 @@ main() {
172173
fi
173174

174175
if [ -n "${c_bench_files}" ]; then
175-
make benchmark-c-files FILES="${c_bench_files}"
176+
# Invoke make in batches to avoid "Argument list too long" errors:
177+
printf '%s\n' ${c_bench_files} | xargs sh -c 'make benchmark-c-files FILES="$*"' _
176178
else
177179
echo 'No C benchmarks to run.' >&2
178180
fi

‎.github/workflows/scripts/run_affected_tests/run‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,8 @@ main() {
165165
files=$(echo "${files}" | grep -v '/fixtures/') || true
166166

167167
if [[ -n "${files}" ]]; then
168-
make test-javascript-files-min FILES="${files}"
168+
# Invoke make in batches to avoid "Argument list too long" errors:
169+
printf '%s\n' ${files} | xargs sh -c 'make test-javascript-files-min FILES="$*"' _
169170
fi
170171

171172
cleanup

‎lib/node_modules/@stdlib/blas/dswap/benchmark/benchmark.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ var isnan = require( '@stdlib/math/base/assert/is-nan' );
2525
var pow = require( '@stdlib/math/base/special/pow' );
2626
var uniform = require( '@stdlib/random/array/uniform' );
2727
var array = require( '@stdlib/ndarray/array' );
28+
var format = require( '@stdlib/string/format' );
2829
var pkg = require( './../package.json' ).name;
2930
var dswap = require( './../lib/main.js' );
3031

@@ -97,7 +98,7 @@ function main() {
9798
for ( i = min; i <= max; i++ ) {
9899
len = pow( 10, i );
99100
f = createBenchmark( len );
100-
bench( pkg+':len='+len, f );
101+
bench( format( '%s:len=%d', pkg, len ), f );
101102
}
102103
}
103104

‎lib/node_modules/@stdlib/blas/dswap/benchmark/benchmark.stacks.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ var pow = require( '@stdlib/math/base/special/pow' );
2626
var uniform = require( '@stdlib/random/array/uniform' );
2727
var numel = require( '@stdlib/ndarray/base/numel' );
2828
var array = require( '@stdlib/ndarray/array' );
29+
var format = require( '@stdlib/string/format' );
2930
var pkg = require( './../package.json' ).name;
3031
var dswap = require( './../lib/main.js' );
3132

@@ -111,11 +112,11 @@ function main() {
111112

112113
shape = [ 2, N/2 ];
113114
f = createBenchmark( shape );
114-
bench( pkg+'::stacks:size='+N+',ndims='+shape.length+',shape=('+shape.join( ',' )+')', f );
115+
bench( format( '%s::stacks:size=%d,ndims=%d,shape=(%s)', pkg, N, shape.length, shape.join( ',' ) ), f );
115116

116117
shape = [ N/2, 2 ];
117118
f = createBenchmark( shape );
118-
bench( pkg+'::stacks:size='+N+',ndims='+shape.length+',shape=('+shape.join( ',' )+')', f );
119+
bench( format( '%s::stacks:size=%d,ndims=%d,shape=(%s)', pkg, N, shape.length, shape.join( ',' ) ), f );
119120
}
120121
}
121122

‎lib/node_modules/@stdlib/blas/ext/base/slast-index-of/benchmark/benchmark.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ var bench = require( '@stdlib/bench' );
2424
var pow = require( '@stdlib/math/base/special/pow' );
2525
var isInteger = require( '@stdlib/assert/is-integer' ).isPrimitive;
2626
var oneTo = require( '@stdlib/array/one-to' );
27+
var format = require( '@stdlib/string/format' );
2728
var pkg = require( './../package.json' ).name;
2829
var slastIndexOf = require( './../lib/slast_index_of.js' );
2930

@@ -89,7 +90,7 @@ function main() {
8990
len = pow( 10, i );
9091

9192
f = createBenchmark( len );
92-
bench( pkg+':len='+len, f );
93+
bench( format( '%s:len=%d', pkg, len ), f );
9394
}
9495
}
9596

‎lib/node_modules/@stdlib/blas/ext/base/slast-index-of/benchmark/benchmark.native.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ var pow = require( '@stdlib/math/base/special/pow' );
2626
var isInteger = require( '@stdlib/assert/is-integer' ).isPrimitive;
2727
var oneTo = require( '@stdlib/array/one-to' );
2828
var tryRequire = require( '@stdlib/utils/try-require' );
29+
var format = require( '@stdlib/string/format' );
2930
var pkg = require( './../package.json' ).name;
3031

3132

@@ -98,7 +99,7 @@ function main() {
9899
len = pow( 10, i );
99100

100101
f = createBenchmark( len );
101-
bench( pkg+'::native:len='+len, opts, f );
102+
bench( format( '%s::native:len=%d', pkg, len ), opts, f );
102103
}
103104
}
104105

‎lib/node_modules/@stdlib/blas/ext/base/slast-index-of/benchmark/benchmark.ndarray.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ var bench = require( '@stdlib/bench' );
2424
var pow = require( '@stdlib/math/base/special/pow' );
2525
var isInteger = require( '@stdlib/assert/is-integer' ).isPrimitive;
2626
var oneTo = require( '@stdlib/array/one-to' );
27+
var format = require( '@stdlib/string/format' );
2728
var pkg = require( './../package.json' ).name;
2829
var slastIndexOf = require( './../lib/ndarray.js' );
2930

@@ -89,7 +90,7 @@ function main() {
8990
len = pow( 10, i );
9091

9192
f = createBenchmark( len );
92-
bench( pkg+':ndarray:len='+len, f );
93+
bench( format( '%s:ndarray:len=%d', pkg, len ), f );
9394
}
9495
}
9596

‎lib/node_modules/@stdlib/blas/ext/base/slast-index-of/benchmark/benchmark.ndarray.native.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ var pow = require( '@stdlib/math/base/special/pow' );
2626
var isInteger = require( '@stdlib/assert/is-integer' ).isPrimitive;
2727
var oneTo = require( '@stdlib/array/one-to' );
2828
var tryRequire = require( '@stdlib/utils/try-require' );
29+
var format = require( '@stdlib/string/format' );
2930
var pkg = require( './../package.json' ).name;
3031

3132

@@ -98,7 +99,7 @@ function main() {
9899
len = pow( 10, i );
99100

100101
f = createBenchmark( len );
101-
bench( pkg+'::native:ndarray:len='+len, opts, f );
102+
bench( format( '%s::native:ndarray:len=%d', pkg, len ), opts, f );
102103
}
103104
}
104105

‎lib/node_modules/@stdlib/blas/ext/base/slinspace/benchmark/benchmark.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ var bench = require( '@stdlib/bench' );
2424
var uniform = require( '@stdlib/random/array/uniform' );
2525
var isnanf = require( '@stdlib/math/base/assert/is-nanf' );
2626
var pow = require( '@stdlib/math/base/special/pow' );
27+
var format = require( '@stdlib/string/format' );
2728
var pkg = require( './../package.json' ).name;
2829
var slinspace = require( './../lib/slinspace.js' );
2930

@@ -90,7 +91,7 @@ function main() {
9091
for ( i = min; i <= max; i++ ) {
9192
len = pow( 10, i );
9293
f = createBenchmark( len );
93-
bench( pkg+':len='+len, f );
94+
bench( format( '%s:len=%d', pkg, len ), f );
9495
}
9596
}
9697

0 commit comments

Comments
 (0)