Skip to content

Commit 9e46bd9

Browse files
aqniaqni
committedJul 25, 2024·
fix dbRunner action
1 parent 614abae commit 9e46bd9

21 files changed

+84
-99
lines changed
 

‎.github/actions/confWriter/action.yml

-12
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,6 @@ inputs:
3333
runs:
3434
using: "composite" # Mandatory parameter
3535
steps:
36-
- if: inputs.DB-name=='FileSystem' || inputs.DB-name=='Parquet'
37-
name: save config for FileSystem and Parquet
38-
shell: bash
39-
run: |
40-
cp -f "${{ inputs.Root-Dir-Path }}/conf/config.properties" "${{ inputs.Root-Dir-Path }}/core/target/iginx-core-${VERSION}/conf/config.properties"
41-
42-
- if: inputs.DB-name=='FileSystem' || inputs.DB-name=='Parquet'
43-
name: save config for FileSystem and Parquet
44-
shell: bash
45-
run: |
46-
cp -f "${{ inputs.Root-Dir-Path }}/conf/config.properties" "${{ inputs.Root-Dir-Path }}/core/target/iginx-core-${VERSION}/conf/config.properties"
47-
4836
- name: Set if-CapExp
4937
shell: bash
5038
run: |

‎.github/actions/dbRunner/action.yml

+11-13
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ runs:
1212
- name: Modify IGinX Config
1313
uses: ./.github/actions/edit
1414
with:
15-
paths: conf/config.properties
15+
paths: core/target/iginx-core-${{ env.VERSION }}/conf/config.properties
1616
statements: s/^storageEngineList=/#storageEngineList=/g
1717

1818
- if: inputs.DB-name=='InfluxDB' || inputs.DB-name=='Mix-IoTDB12-InfluxDB'
@@ -81,16 +81,15 @@ runs:
8181
name: Run DB
8282
shell: bash
8383
run: |
84-
cp -f "${GITHUB_WORKSPACE}/conf/config.properties" "${GITHUB_WORKSPACE}/conf/config.properties.bak"
8584
if [[ "$RUNNER_OS" == "Linux" ]]; then
8685
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/parquet_linux_windows.sh"
87-
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/parquet_linux_windows.sh" 6667 6888 test/mn ${GITHUB_WORKSPACE}/test/iginx_mn false false conf/config.properties
86+
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/parquet_linux_windows.sh" 6667 6888 test/mn ${GITHUB_WORKSPACE}/test/iginx_mn false false core/target/iginx-core-${{ env.VERSION }}/conf/config.properties
8887
elif [[ "$RUNNER_OS" == "Windows" ]]; then
8988
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/parquet_linux_windows.sh"
90-
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/parquet_linux_windows.sh" 6667 6888 test/mn test/iginx_mn false false conf/config.properties
89+
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/parquet_linux_windows.sh" 6667 6888 test/mn test/iginx_mn false false core/target/iginx-core-${{ env.VERSION }}/conf/config.properties
9190
elif [ "$RUNNER_OS" == "macOS" ]; then
9291
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/parquet_macos.sh"
93-
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/parquet_macos.sh" 6667 6888 test/mn test/iginx_mn false false conf/config.properties
92+
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/parquet_macos.sh" 6667 6888 test/mn test/iginx_mn false false core/target/iginx-core-${{ env.VERSION }}/conf/config.properties
9493
else
9594
echo "$RUNNER_OS is not supported"
9695
exit 1
@@ -113,23 +112,22 @@ runs:
113112
name: Modify IGinX Config
114113
uses: ./.github/actions/edit
115114
with:
116-
paths: conf/config.properties
115+
paths: core/target/iginx-core-${{ env.VERSION }}/conf/config.properties
117116
statements: s/^#storageEngineList=127.0.0.1#27017/storageEngineList=127.0.0.1#27017/g
118117

119118
- if: inputs.DB-name=='FileSystem' #test/iginx_mn is the path for IT test data
120119
name: Run DB
121120
shell: bash
122121
run: |
123-
cp -f "${GITHUB_WORKSPACE}/conf/config.properties" "${GITHUB_WORKSPACE}/conf/config.properties.bak"
124122
if [[ "$RUNNER_OS" == "Linux" ]]; then
125123
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/filesystem_linux_windows.sh"
126-
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/filesystem_linux_windows.sh" 6667 6888 test/mn ${GITHUB_WORKSPACE}/test/iginx_mn false false conf/config.properties
124+
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/filesystem_linux_windows.sh" 6667 6888 test/mn ${GITHUB_WORKSPACE}/test/iginx_mn false false core/target/iginx-core-${{ env.VERSION }}/conf/config.properties
127125
elif [[ "$RUNNER_OS" == "Windows" ]]; then
128126
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/filesystem_linux_windows.sh"
129-
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/filesystem_linux_windows.sh" 6667 6888 test/mn test/iginx_mn false false conf/config.properties
127+
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/filesystem_linux_windows.sh" 6667 6888 test/mn test/iginx_mn false false core/target/iginx-core-${{ env.VERSION }}/conf/config.properties
130128
elif [ "$RUNNER_OS" == "macOS" ]; then
131129
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/filesystem_macos.sh"
132-
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/filesystem_macos.sh" 6667 6888 test/mn test/iginx_mn false false conf/config.properties
130+
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/filesystem_macos.sh" 6667 6888 test/mn test/iginx_mn false false core/target/iginx-core-${{ env.VERSION }}/conf/config.properties
133131
else
134132
echo "$RUNNER_OS is not supported"
135133
exit 1
@@ -152,7 +150,7 @@ runs:
152150
name: Modify IGinX Config
153151
uses: ./.github/actions/edit
154152
with:
155-
paths: conf/config.properties
153+
paths: core/target/iginx-core-${{ env.VERSION }}/conf/config.properties
156154
statements: s/^#storageEngineList=127.0.0.1#6379/storageEngineList=127.0.0.1#6379/g
157155

158156
- if: inputs.DB-name=='PostgreSQL'
@@ -172,7 +170,7 @@ runs:
172170
name: Modify IGinX Config
173171
uses: ./.github/actions/edit
174172
with:
175-
paths: conf/config.properties
173+
paths: core/target/iginx-core-${{ env.VERSION }}/conf/config.properties
176174
statements: s/^#storageEngineList=127.0.0.1#5432#relational#engine=postgresql/storageEngineList=127.0.0.1#5432#relational#engine=postgresql/g
177175

178176
- if: inputs.DB-name=='MySQL'
@@ -201,5 +199,5 @@ runs:
201199
name: Modify IGinX Config
202200
uses: ./.github/actions/edit
203201
with:
204-
paths: conf/config.properties
202+
paths: core/target/iginx-core-${{ env.VERSION }}/conf/config.properties
205203
statements: s|^#storageEngineList=127.0.0.1#3306#relational#engine=mysql#username=root#password=mysql#has_data=false#meta_properties_path=your-meta-properties-path|storageEngineList=127.0.0.1#3306#relational#engine=mysql#username=root#has_data=false#meta_properties_path=${{ steps.mysql-properties.outputs.path }}|g

‎.github/scripts/dataSources/filesystem_linux_windows.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
set -e
2222

23-
cp -f conf/config.properties.bak $7
23+
cp -f conf/config.properties $7
2424

2525
sed -i "s/^storageEngineList=127.0.0.1#6667#iotdb12/#storageEngineList=127.0.0.1#6667#iotdb12/" $7
2626

‎.github/scripts/dataSources/filesystem_macos.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
set -e
2222

23-
cp -f conf/config.properties.bak $7
23+
cp -f conf/config.properties $7
2424

2525
sed -i "" "s/^storageEngineList=127.0.0.1#6667#iotdb12/#storageEngineList=127.0.0.1#6667#iotdb12/g" $7
2626

‎.github/scripts/dataSources/influxdb.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ sh -c "sleep 30"
3030

3131
sh -c "./influxdb2-2.0.7-linux-amd64/influx setup --org testOrg --bucket testBucket --username user --password 12345678 --token testToken --force"
3232

33-
sed -i "s/your-token/testToken/g" conf/config.properties
33+
sed -i "s/your-token/testToken/g" core/target/iginx-core-${VERSION}/conf/config.properties
3434

35-
sed -i "s/your-organization/testOrg/g" conf/config.properties
35+
sed -i "s/your-organization/testOrg/g" core/target/iginx-core-${VERSION}/conf/config.properties
3636

37-
sed -i "s/storageEngineList=127.0.0.1#6667/#storageEngineList=127.0.0.1#6667/g" conf/config.properties
37+
sed -i "s/storageEngineList=127.0.0.1#6667/#storageEngineList=127.0.0.1#6667/g" core/target/iginx-core-${VERSION}/conf/config.properties
3838

39-
sed -i "s/#storageEngineList=127.0.0.1#8086/storageEngineList=127.0.0.1#8086/g" conf/config.properties
39+
sed -i "s/#storageEngineList=127.0.0.1#8086/storageEngineList=127.0.0.1#8086/g" core/target/iginx-core-${VERSION}/conf/config.properties
4040

4141
for port in "$@"
4242
do

‎.github/scripts/dataSources/influxdb_macos.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ sh -c "sleep 30"
3030

3131
sh -c "./influxdb2-2.0.7-darwin-amd64/influx setup --org testOrg --bucket testBucket --username user --password 12345678 --token testToken --force"
3232

33-
sed -i "" "s/your-token/testToken/" conf/config.properties
33+
sed -i "" "s/your-token/testToken/" core/target/iginx-core-${VERSION}/conf/config.properties
3434

35-
sed -i "" "s/your-organization/testOrg/" conf/config.properties
35+
sed -i "" "s/your-organization/testOrg/" core/target/iginx-core-${VERSION}/conf/config.properties
3636

37-
sed -i "" "s/storageEngineList=127.0.0.1#6667/#storageEngineList=127.0.0.1#6667/" conf/config.properties
37+
sed -i "" "s/storageEngineList=127.0.0.1#6667/#storageEngineList=127.0.0.1#6667/" core/target/iginx-core-${VERSION}/conf/config.properties
3838

39-
sed -i "" "s/#storageEngineList=127.0.0.1#8086/storageEngineList=127.0.0.1#8086/" conf/config.properties
39+
sed -i "" "s/#storageEngineList=127.0.0.1#8086/storageEngineList=127.0.0.1#8086/" core/target/iginx-core-${VERSION}/conf/config.properties
4040

4141
for port in "$@"
4242
do

‎.github/scripts/dataSources/influxdb_windows.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ sh -c "sleep 30"
3838

3939
sh -c "./influxdb2-2.0.7-windows-amd64/influx setup --org testOrg --bucket testBucket --username user --password 12345678 --token testToken --force"
4040

41-
sed -i "s/your-token/testToken/g" conf/config.properties
41+
sed -i "s/your-token/testToken/g" core/target/iginx-core-${VERSION}/conf/config.properties
4242

43-
sed -i "s/your-organization/testOrg/g" conf/config.properties
43+
sed -i "s/your-organization/testOrg/g" core/target/iginx-core-${VERSION}/conf/config.properties
4444

45-
sed -i "s/storageEngineList=127.0.0.1#6667/#storageEngineList=127.0.0.1#6667/g" conf/config.properties
45+
sed -i "s/storageEngineList=127.0.0.1#6667/#storageEngineList=127.0.0.1#6667/g" core/target/iginx-core-${VERSION}/conf/config.properties
4646

47-
sed -i "s/#storageEngineList=127.0.0.1#8086/storageEngineList=127.0.0.1#8086/g" conf/config.properties
47+
sed -i "s/#storageEngineList=127.0.0.1#8086/storageEngineList=127.0.0.1#8086/g" core/target/iginx-core-${VERSION}/conf/config.properties
4848

4949
for port in "$@"
5050
do

‎.github/scripts/dataSources/iotdb12.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ sh -c "echo ========================="
2626

2727
sh -c "ls apache-iotdb-0.12.6-server-bin"
2828

29-
sh -c "sudo sed -i 's/#storageEngineList=127.0.0.1#6667#iotdb12/storageEngineList=127.0.0.1#6667#iotdb12/g' conf/config.properties"
29+
sh -c "sudo sed -i 's/#storageEngineList=127.0.0.1#6667#iotdb12/storageEngineList=127.0.0.1#6667#iotdb12/g' core/target/iginx-core-${VERSION}/conf/config.properties"
3030

3131
sh -c "sudo sed -i 's/^# compaction_strategy=.*$/compaction_strategy=NO_COMPACTION/g' apache-iotdb-0.12.6-server-bin/conf/iotdb-engine.properties"
3232

‎.github/scripts/dataSources/iotdb12_macos.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ sh -c "ls apache-iotdb-0.12.6-server-bin"
2828

2929
sh -c "sudo sed -i '' 's/^# compaction_strategy=.*$/compaction_strategy=NO_COMPACTION/' apache-iotdb-0.12.6-server-bin/conf/iotdb-engine.properties"
3030

31-
sh -c "sudo sed -i '' 's/#storageEngineList=127.0.0.1#6667#iotdb12/storageEngineList=127.0.0.1#6667#iotdb12/g' conf/config.properties"
31+
sh -c "sudo sed -i '' 's/#storageEngineList=127.0.0.1#6667#iotdb12/storageEngineList=127.0.0.1#6667#iotdb12/g' core/target/iginx-core-${VERSION}/conf/config.properties"
3232

3333
for port in "$@"
3434
do

‎.github/scripts/dataSources/iotdb12_windows.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ sh -c "sed -i 's/# wal_buffer_size=16777216/wal_buffer_size=167772160/g' apache-
3030

3131
sh -c "sed -i 's/^# compaction_strategy=.*$/compaction_strategy=NO_COMPACTION/g' apache-iotdb-0.12.6-server-bin/conf/iotdb-engine.properties"
3232

33-
sh -c "sed -i 's/#storageEngineList=127.0.0.1#6667#iotdb12/storageEngineList=127.0.0.1#6667#iotdb12/g' conf/config.properties"
33+
sh -c "sed -i 's/#storageEngineList=127.0.0.1#6667#iotdb12/storageEngineList=127.0.0.1#6667#iotdb12/g' core/target/iginx-core-${VERSION}/conf/config.properties"
3434

3535
for port in "$@"
3636
do

‎.github/scripts/dataSources/mix_iotdb12_influxdb.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ sh -c ".github/scripts/dataSources/iotdb12.sh 6667"
2828

2929
sh -c ".github/scripts/dataSources/influxdb.sh"
3030

31-
set -i "s/storageEngineList/#storageEngineList/g" conf/config.properties
31+
set -i "s/storageEngineList/#storageEngineList/g" core/target/iginx-core-${VERSION}/conf/config.properties
3232

33-
echo "storageEngineList=127.0.0.1#6667#iotdb12#username=root#password=root#sessionPoolSize=50#has_data=false#is_read_only=false,127.0.0.1#8086#influxdb#url=http://localhost:8086/#token=testToken#organization=testOrg#has_data=false" >> conf/config.properties
33+
echo "storageEngineList=127.0.0.1#6667#iotdb12#username=root#password=root#sessionPoolSize=50#has_data=false#is_read_only=false,127.0.0.1#8086#influxdb#url=http://localhost:8086/#token=testToken#organization=testOrg#has_data=false" >> core/target/iginx-core-${VERSION}/conf/config.properties

‎.github/scripts/dataSources/mix_iotdb12_influxdb_macos.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ sh -c ".github/scripts/dataSources/iotdb12_macos.sh 6667"
2828

2929
sh -c ".github/scripts/dataSources/influxdb_macos.sh"
3030

31-
set -i "s/storageEngineList/#storageEngineList/g" conf/config.properties
31+
set -i "s/storageEngineList/#storageEngineList/g" core/target/iginx-core-${VERSION}/conf/config.properties
3232

33-
echo "storageEngineList=127.0.0.1#6667#iotdb12#username=root#password=root#sessionPoolSize=50#has_data=false#is_read_only=false,127.0.0.1#8086#influxdb#url=http://localhost:8086/#token=testToken#organization=testOrg#has_data=false" >> conf/config.properties
33+
echo "storageEngineList=127.0.0.1#6667#iotdb12#username=root#password=root#sessionPoolSize=50#has_data=false#is_read_only=false,127.0.0.1#8086#influxdb#url=http://localhost:8086/#token=testToken#organization=testOrg#has_data=false" >> core/target/iginx-core-${VERSION}/conf/config.properties

‎.github/scripts/dataSources/mix_iotdb12_influxdb_windows.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ sh -c ".github/scripts/dataSources/iotdb12_windows.sh 6667"
2828

2929
sh -c ".github/scripts/dataSources/influxdb_windows.sh"
3030

31-
sed -i "s/storageEngineList/#storageEngineList/g" conf/config.properties
31+
sed -i "s/storageEngineList/#storageEngineList/g" core/target/iginx-core-${VERSION}/conf/config.properties
3232

33-
echo "storageEngineList=127.0.0.1#6667#iotdb12#username=root#password=root#sessionPoolSize=50#has_data=false#is_read_only=false,127.0.0.1#8086#influxdb#url=http://localhost:8086/#token=testToken#organization=testOrg#has_data=false" >> conf/config.properties
33+
echo "storageEngineList=127.0.0.1#6667#iotdb12#username=root#password=root#sessionPoolSize=50#has_data=false#is_read_only=false,127.0.0.1#8086#influxdb#url=http://localhost:8086/#token=testToken#organization=testOrg#has_data=false" >> core/target/iginx-core-${VERSION}/conf/config.properties

‎.github/scripts/dataSources/parquet_linux_windows.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
set -e
2222

23-
cp -f conf/config.properties.bak $7
23+
cp -f conf/config.properties $7
2424

2525
sed -i "s/^storageEngineList=127.0.0.1#6667#iotdb12/#storageEngineList=127.0.0.1#6667#iotdb12/g" $7
2626

‎.github/scripts/dataSources/parquet_macos.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
set -e
2222

23-
cp -f conf/config.properties.bak $7
23+
cp -f conf/config.properties $7
2424

2525
sed -i "" "s/^storageEngineList=127.0.0.1#6667#iotdb12/#storageEngineList=127.0.0.1#6667#iotdb12/g" $7
2626

‎.github/workflows/test-capacity-expansion.yml

+25-25
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@ jobs:
5454
python-version: ${{ matrix.python-version }}
5555
java: ${{ matrix.java }}
5656

57+
- name: Install IGinX with Maven
58+
shell: bash
59+
run: |
60+
mvn clean package -DskipTests -P-format
61+
5762
- name: Run Metadata
5863
uses: ./.github/actions/metadataRunner
5964
with:
@@ -64,11 +69,6 @@ jobs:
6469
with:
6570
DB-name: ${{ matrix.DB-name }}
6671

67-
- name: Install IGinX with Maven
68-
shell: bash
69-
run: |
70-
mvn clean package -DskipTests -P-format
71-
7272
- name: Prepare CapExp environment oriHasDataExpHasData
7373
uses: ./.github/actions/capacityExpansionUnionTest
7474
with:
@@ -128,6 +128,11 @@ jobs:
128128
python-version: ${{ matrix.python-version }}
129129
java: ${{ matrix.java }}
130130

131+
- name: Install IGinX with Maven
132+
shell: bash
133+
run: |
134+
mvn clean package -DskipTests -P-format
135+
131136
- name: Run Metadata
132137
uses: ./.github/actions/metadataRunner
133138
with:
@@ -138,11 +143,6 @@ jobs:
138143
with:
139144
DB-name: ${{ matrix.DB-name }}
140145

141-
- name: Install IGinX with Maven
142-
shell: bash
143-
run: |
144-
mvn clean package -DskipTests -P-format
145-
146146
- name: Prepare CapExp environment oriNoDataExpNoData
147147
uses: ./.github/actions/capacityExpansionUnionTest
148148
with:
@@ -202,6 +202,11 @@ jobs:
202202
python-version: ${{ matrix.python-version }}
203203
java: ${{ matrix.java }}
204204

205+
- name: Install IGinX with Maven
206+
shell: bash
207+
run: |
208+
mvn clean package -DskipTests -P-format
209+
205210
- name: Run Metadata
206211
uses: ./.github/actions/metadataRunner
207212
with:
@@ -212,11 +217,6 @@ jobs:
212217
with:
213218
DB-name: ${{ matrix.DB-name }}
214219

215-
- name: Install IGinX with Maven
216-
shell: bash
217-
run: |
218-
mvn clean package -DskipTests -P-format
219-
220220
- name: Prepare CapExp environment oriHasDataExpNoData
221221
uses: ./.github/actions/capacityExpansionUnionTest
222222
with:
@@ -277,6 +277,11 @@ jobs:
277277
python-version: ${{ matrix.python-version }}
278278
java: ${{ matrix.java }}
279279

280+
- name: Install IGinX with Maven
281+
shell: bash
282+
run: |
283+
mvn clean package -DskipTests -P-format
284+
280285
- name: Run Metadata
281286
uses: ./.github/actions/metadataRunner
282287
with:
@@ -287,11 +292,6 @@ jobs:
287292
with:
288293
DB-name: ${{ matrix.DB-name }}
289294

290-
- name: Install IGinX with Maven
291-
shell: bash
292-
run: |
293-
mvn clean package -DskipTests -P-format
294-
295295
- name: Prepare CapExp environment oriNoDataExpHasData
296296
uses: ./.github/actions/capacityExpansionUnionTest
297297
with:
@@ -352,6 +352,11 @@ jobs:
352352
python-version: ${{ matrix.python-version }}
353353
java: ${{ matrix.java }}
354354

355+
- name: Install IGinX with Maven
356+
shell: bash
357+
run: |
358+
mvn clean package -DskipTests -P-format
359+
355360
- name: Run Metadata
356361
uses: ./.github/actions/metadataRunner
357362
with:
@@ -362,11 +367,6 @@ jobs:
362367
with:
363368
DB-name: ${{ matrix.DB-name }}
364369

365-
- name: Install IGinX with Maven
366-
shell: bash
367-
run: |
368-
mvn clean package -DskipTests -P-format
369-
370370
- name: Prepare CapExp environment for testReadOnly
371371
uses: ./.github/actions/capacityExpansionUnionTest
372372
with:

‎.github/workflows/test-cli.yml

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ jobs:
6868
uses: ./.github/actions/confWriter
6969
with:
7070
DB-name: ${{ matrix.DB-name }}
71-
Set-Filter-Fragment-OFF: "true"
7271
Metadata: ${{ matrix.metadata }}
7372

7473
# start udf path test first to avoid being effected

‎.github/workflows/test-mixed-cluster.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ jobs:
4343
python-version: ${{ matrix.python-version }}
4444
java: ${{ matrix.java }}
4545

46+
- name: Install IGinX with Maven
47+
shell: bash
48+
run: |
49+
mvn clean package -DskipTests -P-format
50+
4651
- name: Run Metadata
4752
uses: ./.github/actions/metadataRunner
4853
with:
@@ -53,11 +58,6 @@ jobs:
5358
with:
5459
DB-name: "Mix-IoTDB12-InfluxDB"
5560

56-
- name: Install IGinX with Maven
57-
shell: bash
58-
run: |
59-
mvn clean package -DskipTests -P-format
60-
6161
- name: Write Conf
6262
uses: ./.github/actions/confWriter
6363
with:

‎.github/workflows/test-remote.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ jobs:
5252
java: ${{ matrix.java }}
5353
docker-required: true
5454

55+
- name: Install IGinX with Maven
56+
shell: bash
57+
run: |
58+
mvn clean package -DskipTests -P-format
59+
5560
- if: runner.os == 'Windows'
5661
name: Set up Docker Firewall on Windows
5762
run: |
@@ -76,11 +81,6 @@ jobs:
7681
with:
7782
DB-name: ${{ matrix.DB-name }}
7883

79-
- name: Install IGinX with Maven
80-
shell: bash
81-
run: |
82-
mvn clean package -DskipTests -P-format
83-
8484
- if: runner.os == 'Windows'
8585
name: Build & Run Client image
8686
shell: cmd

‎.github/workflows/test-single-database.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@ jobs:
5454
python-version: ${{ matrix.python-version }}
5555
java: ${{ matrix.java }}
5656

57+
- name: Install IGinX with Maven
58+
shell: bash
59+
run: |
60+
mvn clean package -DskipTests -P-format
61+
5762
- name: Run Metadata
5863
uses: ./.github/actions/metadataRunner
5964
with:
@@ -64,11 +69,6 @@ jobs:
6469
with:
6570
DB-name: ${{ matrix.DB-name }}
6671

67-
- name: Install IGinX with Maven
68-
shell: bash
69-
run: |
70-
mvn clean package -DskipTests -P-format
71-
7272
- name: Change IGinX config
7373
uses: ./.github/actions/confWriter
7474
with:

‎.github/workflows/tpc-h.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,6 @@ jobs:
8181
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/tpch/download_tpch_data.sh"
8282
"${GITHUB_WORKSPACE}/.github/scripts/tpch/download_tpch_data.sh"
8383
84-
- name: Run ZooKeeper
85-
uses: ./.github/actions/zookeeperRunner
86-
87-
- name: Run DB
88-
uses: ./.github/actions/dbRunner
89-
with:
90-
DB-name: ${{ matrix.DB-name }}
91-
9284
- name: Get Old Version IGinX
9385
shell: bash
9486
run: git clone https://github.com/IGinX-THU/IGinX.git
@@ -124,6 +116,14 @@ jobs:
124116
Set-Filter-Fragment-OFF: "true"
125117
Metadata: ${{ matrix.metadata }}
126118

119+
- name: Run ZooKeeper
120+
uses: ./.github/actions/zookeeperRunner
121+
122+
- name: Run DB
123+
uses: ./.github/actions/dbRunner
124+
with:
125+
DB-name: ${{ matrix.DB-name }}
126+
127127
- name: Insert Data into DB
128128
uses: ./.github/actions/tpchDataWriter
129129
with:

0 commit comments

Comments
 (0)
Please sign in to comment.