Skip to content

Commit 8ac74f9

Browse files
authored
Merge branch 'main' into bump-opendal
2 parents 7db5818 + aad04ab commit 8ac74f9

File tree

4 files changed

+849
-772
lines changed

4 files changed

+849
-772
lines changed

.github/actions/fuse_compat/action.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ inputs:
1212
runs:
1313
using: "composite"
1414
steps:
15-
- name: Setup Build Tool
16-
uses: ./.github/actions/setup_build_tool
17-
1815
- name: Download artifact
1916
uses: ./.github/actions/artifact_download
2017
with:
@@ -26,8 +23,20 @@ runs:
2623
- name: Test compatibility
2724
shell: bash
2825
run: |
29-
build-tool bash ./tests/fuse-compat/test-fuse-compat.sh 0.7.150
30-
build-tool bash ./tests/fuse-compat/test-fuse-compat.sh 0.7.151
26+
docker run --rm --tty --net=host \
27+
--user $(id -u):$(id -g) \
28+
--env BUILD_PROFILE \
29+
--volume "${PWD}:/workspace" \
30+
--workdir "/workspace" \
31+
datafuselabs/build-tool:sqllogic \
32+
bash ./tests/fuse-compat/test-fuse-compat.sh 0.7.150
33+
docker run --rm --tty --net=host \
34+
--user $(id -u):$(id -g) \
35+
--env BUILD_PROFILE \
36+
--volume "${PWD}:/workspace" \
37+
--workdir "/workspace" \
38+
datafuselabs/build-tool:sqllogic \
39+
bash ./tests/fuse-compat/test-fuse-compat.sh 0.7.151
3140
3241
- name: Upload failure
3342
if: failure()

tests/compat/test-compat.sh

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,33 @@ kill_proc() {
134134
echo " === Done kill $name"
135135
}
136136

137+
# Find path in old and new location.
138+
# Databend release once changed binary path from `./` to `./bin`.
139+
find_binary_path()
140+
{
141+
local base="$1"
142+
local binary_name="$2"
143+
144+
if [ -f "$base/$binary_name" ]; then
145+
echo "$base/$binary_name"
146+
elif [ -f "$base/bin/$binary_name" ]; then
147+
echo "$base/bin/$binary_name"
148+
else
149+
echo " === Can not find binary path for $binary_name in $base/ or $base/bin" >&2
150+
exit 1
151+
fi
152+
153+
}
154+
137155
# Test specified version of query and meta
138156
run_test() {
139157
local query_ver="$1"
140158
local metasrv_ver="$2"
141159

142160
echo " === Test with query-$query_ver and metasrv-$metasrv_ver"
143161

144-
local query="./bins/$query_ver/databend-query"
145-
local metasrv="./bins/$metasrv_ver/databend-meta"
162+
local query="$(find_binary_path "./bins/$query_ver" "databend-query")"
163+
local metasrv="$(find_binary_path "./bins/$metasrv_ver" "databend-meta")"
146164

147165
# "$metasrv" --single --cmd ver
148166

0 commit comments

Comments
 (0)