Skip to content

Commit fec1015

Browse files
authored
fix: Wildcards for Distro Scripts (#371)
1 parent 885b112 commit fec1015

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

.github/distro/benchmark.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ scale.row.count=1000000
3737
# Blank: Overwrite if JUnit launch, timestamp if Benchmark main launch
3838
timestamp.test.results=
3939

40-
# Experimental: Docker compose file (e.g. /mypath/docker-compose.yml
40+
# Experimental: Docker compose file (e.g. /mypath/docker-compose.yml)
41+
# Use blank to disable restarts between test runs (only recommended for smoke tests)
4142
docker.compose.file=./docker-compose.yml
4243

.github/distro/benchmark.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
set -o errexit
44
set -o pipefail
55
set -o nounset
6+
set -f
67

78
# Copyright (c) 2023-2024 Deephaven Data Labs and Patent Pending
89
#
@@ -11,9 +12,9 @@ set -o nounset
1112
# any previous run and produce results as a set of csv files for each iteration.
1213
#
1314
# Examples:
14-
# - Run Where benchmarks three times: ./benchmark.sh 1 Where
15+
# - Run Where benchmarks three times: ./benchmark.sh 1 "Where"
1516
# - Run Where and AvgBy benchmarks three times: ./benchmark.sh 3 "Where,Avg*"
16-
# - Run all benchmarks one time: ./benchmark.sh 1 *
17+
# - Run all benchmarks one time: ./benchmark.sh 1 "*"
1718
#
1819
# Notes:
1920
# - Docker is a prerequisite, and the Deephaven image will be installed if it's missing
@@ -39,9 +40,11 @@ sudo rm -f ./data/*.def
3940
sudo rm -f ./data/*.parquet
4041

4142
sudo docker compose up -d
43+
sleep 5
44+
set -f
4245

4346
TEST_REGEX="^.*[.]("
44-
for r in $(echo ${TEST_WILD} | sed 's/\s*,\s*/ /g'); do
47+
for r in $(echo "${TEST_WILD}" | sed 's/\s*,\s*/ /g'); do
4548
TEST_REGEX="${TEST_REGEX}"$(echo "(${r}Test)|" | sed 's/\*/.*/g')
4649
done
4750
TEST_REGEX=$(echo ${TEST_REGEX} | sed -E 's/\|+$//g')

.github/workflows/publish-benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
- name: Archive Results
9999
uses: actions/upload-artifact@v4
100100
with:
101-
name: Deephaven Benchmark Release
101+
name: Deephaven Benchmark Release ${{env.VERSION}}
102102
path: |
103103
deephaven-benchmark-${{env.VERSION}}.tar
104104
deephaven-benchmark-${{env.VERSION}}-results.tar

0 commit comments

Comments
 (0)