Skip to content

Commit 6a75d38

Browse files
committed
make sure only new upgraded solutions are tested
1 parent 3be8a1d commit 6a75d38

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

.github/workflows/RunBenchmark.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ jobs:
5353
run: |
5454
./_setup_utils/mount.sh
5555
56+
# TODO: Remove this.
5657
- name: checkout correct branch
5758
shell: bash
5859
working-directory: /var/lib/mount/db-benchmark-metal
@@ -64,8 +65,18 @@ jobs:
6465
working-directory: /var/lib/mount/db-benchmark-metal
6566
run: |
6667
python3 _setup_utils/install_all_solutions.py all --exclude clickhouse
67-
# clickhouse needs sudo priviledges
68-
sudo python3 _setup_utils/install_all_solutions clickhouse
68+
# installing/updating clickhouse needs sudo priviledges
69+
sudo python3 _setup_utils/install_all_solutions.py clickhouse
70+
71+
- name: Modify run.conf to only have new versions
72+
shell: bash
73+
working-directory: /var/lib/mount/db-benchmark-metal
74+
run: |
75+
git diff --name-only **/VERSION > updated_solutions.csv
76+
sed -i 's/\/VERSION/ /g' updated_solutions.txt
77+
tr --delete '\n' < updated_solutions.txt > updated_solutions_no_newlines.txt
78+
export new_solutions=`cat updated_solutions_no_newlines.txt`
79+
sed -i "s/export RUN_SOLUTIONS=.*/export RUN_SOLUTIONS=\"${new_solutions}\"/g" run.conf
6980
7081
- name: Run the benchmark
7182
shell: bash

clickhouse/ver-clickhouse.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ set -e
44
source ./clickhouse/ch.sh # clickhouse helper scripts
55

66
ch_installed && clickhouse-client --version-clean > clickhouse/VERSION && echo "" > clickhouse/REVISION
7+
8+
sudo chown $whoami:$whoami clickhouse/VERSION
9+
sudo chown $whoami:$whoami clickhouse/REVISION

dask/setup-dask.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -e
33

4-
virtualenv dask/py-dask --python=python3.10
4+
virtualenv dask/py-dask --python=python3.12
55
source dask/py-dask/bin/activate
66

77
# install binaries

0 commit comments

Comments
 (0)