Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 1fe19d4

Browse files
aqniaqni
committedJul 25, 2024·
fix dbRunner action
1 parent e0d96f0 commit 1fe19d4

10 files changed

+32
-32
lines changed
 

‎.github/actions/dbRunner/action.yml

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

2121
- if: inputs.DB-name=='InfluxDB' || inputs.DB-name=='Mix-IoTDB12-InfluxDB'
@@ -86,13 +86,13 @@ runs:
8686
run: |
8787
if [[ "$RUNNER_OS" == "Linux" ]]; then
8888
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/parquet_linux_windows.sh"
89-
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/parquet_linux_windows.sh" 6667 6888 test/mn ${GITHUB_WORKSPACE}/test/iginx_mn false false ${{ env.CONFIG_PATH }}
89+
"${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
9090
elif [[ "$RUNNER_OS" == "Windows" ]]; then
9191
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/parquet_linux_windows.sh"
92-
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/parquet_linux_windows.sh" 6667 6888 test/mn test/iginx_mn false false ${{ env.CONFIG_PATH }}
92+
"${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
9393
elif [ "$RUNNER_OS" == "macOS" ]; then
9494
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/parquet_macos.sh"
95-
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/parquet_macos.sh" 6667 6888 test/mn test/iginx_mn false false ${{ env.CONFIG_PATH }}
95+
"${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
9696
else
9797
echo "$RUNNER_OS is not supported"
9898
exit 1
@@ -115,7 +115,7 @@ runs:
115115
name: Modify IGinX Config
116116
uses: ./.github/actions/edit
117117
with:
118-
paths: ${{ env.CONFIG_PATH }}
118+
paths: core/target/iginx-core-${{ env.VERSION }}/conf/config.properties
119119
statements: s/^#storageEngineList=127.0.0.1#27017/storageEngineList=127.0.0.1#27017/g
120120

121121
- if: inputs.DB-name=='FileSystem' #test/iginx_mn is the path for IT test data
@@ -124,13 +124,13 @@ runs:
124124
run: |
125125
if [[ "$RUNNER_OS" == "Linux" ]]; then
126126
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/filesystem_linux_windows.sh"
127-
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/filesystem_linux_windows.sh" 6667 6888 test/mn ${GITHUB_WORKSPACE}/test/iginx_mn false false ${{ env.CONFIG_PATH }}
127+
"${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
128128
elif [[ "$RUNNER_OS" == "Windows" ]]; then
129129
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/filesystem_linux_windows.sh"
130-
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/filesystem_linux_windows.sh" 6667 6888 test/mn test/iginx_mn false false ${{ env.CONFIG_PATH }}
130+
"${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
131131
elif [ "$RUNNER_OS" == "macOS" ]; then
132132
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/filesystem_macos.sh"
133-
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/filesystem_macos.sh" 6667 6888 test/mn test/iginx_mn false false ${{ env.CONFIG_PATH }}
133+
"${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
134134
else
135135
echo "$RUNNER_OS is not supported"
136136
exit 1
@@ -153,7 +153,7 @@ runs:
153153
name: Modify IGinX Config
154154
uses: ./.github/actions/edit
155155
with:
156-
paths: ${{ env.CONFIG_PATH }}
156+
paths: core/target/iginx-core-${{ env.VERSION }}/conf/config.properties
157157
statements: s/^#storageEngineList=127.0.0.1#6379/storageEngineList=127.0.0.1#6379/g
158158

159159
- if: inputs.DB-name=='PostgreSQL'
@@ -173,7 +173,7 @@ runs:
173173
name: Modify IGinX Config
174174
uses: ./.github/actions/edit
175175
with:
176-
paths: ${{ env.CONFIG_PATH }}
176+
paths: core/target/iginx-core-${{ env.VERSION }}/conf/config.properties
177177
statements: s/^#storageEngineList=127.0.0.1#5432#relational#engine=postgresql/storageEngineList=127.0.0.1#5432#relational#engine=postgresql/g
178178

179179
- if: inputs.DB-name=='MySQL'
@@ -202,5 +202,5 @@ runs:
202202
name: Modify IGinX Config
203203
uses: ./.github/actions/edit
204204
with:
205-
paths: ${{ env.CONFIG_PATH }}
205+
paths: core/target/iginx-core-${{ env.VERSION }}/conf/config.properties
206206
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/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" ${CONFIG_PATH}
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" ${CONFIG_PATH}
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" ${CONFIG_PATH}
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" ${CONFIG_PATH}
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/" ${CONFIG_PATH}
33+
sed -i "" "s/your-token/testToken/" core/target/iginx-core-${VERSION}/conf/config.properties
3434

35-
sed -i "" "s/your-organization/testOrg/" ${CONFIG_PATH}
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/" ${CONFIG_PATH}
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/" ${CONFIG_PATH}
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" ${CONFIG_PATH}
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" ${CONFIG_PATH}
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" ${CONFIG_PATH}
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" ${CONFIG_PATH}
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' ${CONFIG_PATH}"
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' ${CONFIG_PATH}"
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' ${CONFIG_PATH}"
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" ${CONFIG_PATH}
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" >> ${CONFIG_PATH}
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" ${CONFIG_PATH}
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" >> ${CONFIG_PATH}
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" ${CONFIG_PATH}
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" >> ${CONFIG_PATH}
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

0 commit comments

Comments
 (0)
Please sign in to comment.