Skip to content

Commit 275334f

Browse files
committed
fix(ci): harden glibc checks and drop removed source-build workflow refs
Fail manylinux package scripts when GLIBC symbols cannot be parsed, and remove stale client-cpp-source-build.yml path triggers left after that workflow was deleted.
1 parent 16f3704 commit 275334f

13 files changed

Lines changed: 10 additions & 23 deletions

.github/scripts/package-client-cpp-manylinux-glibc217.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,11 @@ objdump -T "${SO}" | grep GLIBC_ | sed "s/.*GLIBC_/GLIBC_/" | sort -Vu | tail -1
8282
max_glibc=$(objdump -T "${SO}" | grep -oE "GLIBC_[0-9.]+" | sed "s/GLIBC_//" | sort -t. -k1,1n -k2,2n -k3,3n | tail -1)
8383
echo "max_glibc=${max_glibc}"
8484

85+
if [[ -z "${max_glibc}" ]]; then
86+
echo "ERROR: could not determine max GLIBC version from ${SO}"
87+
exit 1
88+
fi
89+
8590
if awk -v max="${max_glibc}" "BEGIN { exit !(max > 2.17) }"; then
8691
echo "ERROR: libiotdb_session.so requires glibc > 2.17 (max=${max_glibc})"
8792
exit 1

.github/scripts/package-client-cpp-manylinux-glibc224.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,11 @@ objdump -T "${SO}" | grep GLIBC_ | sed "s/.*GLIBC_/GLIBC_/" | sort -Vu | tail -1
102102
max_glibc=$(objdump -T "${SO}" | grep -oE "GLIBC_[0-9.]+" | sed "s/GLIBC_//" | sort -t. -k1,1n -k2,2n -k3,3n | tail -1)
103103
echo "max_glibc=${max_glibc}"
104104

105+
if [[ -z "${max_glibc}" ]]; then
106+
echo "ERROR: could not determine max GLIBC version from ${SO}"
107+
exit 1
108+
fi
109+
105110
if awk -v max="${max_glibc}" -v limit="${MAX_GLIBC}" 'BEGIN { exit !(max > limit) }'; then
106111
echo "ERROR: libiotdb_session.so requires glibc > ${MAX_GLIBC} (max=${max_glibc})"
107112
exit 1

.github/workflows/cluster-it-1c1d.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ on:
1212
- "iotdb-client/client-cpp/**"
1313
- "example/client-cpp-example/**"
1414
- ".github/workflows/client-cpp-package.yml"
15-
- ".github/workflows/client-cpp-source-build.yml"
1615
- ".github/scripts/package-client-cpp-*.sh"
1716
- ".github/workflows/multi-language-client.yml"
1817
pull_request:
@@ -26,7 +25,6 @@ on:
2625
- "iotdb-client/client-cpp/**"
2726
- "example/client-cpp-example/**"
2827
- ".github/workflows/client-cpp-package.yml"
29-
- ".github/workflows/client-cpp-source-build.yml"
3028
- ".github/scripts/package-client-cpp-*.sh"
3129
- ".github/workflows/multi-language-client.yml"
3230
# allow manually run the action:

.github/workflows/cluster-it-1c1d1a.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ on:
1212
- 'iotdb-client/client-cpp/**'
1313
- 'example/client-cpp-example/**'
1414
- '.github/workflows/client-cpp-package.yml'
15-
- '.github/workflows/client-cpp-source-build.yml'
1615
- '.github/scripts/package-client-cpp-*.sh'
1716
- '.github/workflows/multi-language-client.yml'
1817
pull_request:
@@ -27,7 +26,6 @@ on:
2726
- 'iotdb-client/client-cpp/**'
2827
- 'example/client-cpp-example/**'
2928
- '.github/workflows/client-cpp-package.yml'
30-
- '.github/workflows/client-cpp-source-build.yml'
3129
- '.github/scripts/package-client-cpp-*.sh'
3230
- '.github/workflows/multi-language-client.yml'
3331
# allow manually run the action:

.github/workflows/cluster-it-1c3d.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ on:
1212
- "iotdb-client/client-cpp/**"
1313
- "example/client-cpp-example/**"
1414
- ".github/workflows/client-cpp-package.yml"
15-
- ".github/workflows/client-cpp-source-build.yml"
1615
- ".github/scripts/package-client-cpp-*.sh"
1716
- ".github/workflows/multi-language-client.yml"
1817
pull_request:
@@ -27,7 +26,6 @@ on:
2726
- "iotdb-client/client-cpp/**"
2827
- "example/client-cpp-example/**"
2928
- ".github/workflows/client-cpp-package.yml"
30-
- ".github/workflows/client-cpp-source-build.yml"
3129
- ".github/scripts/package-client-cpp-*.sh"
3230
- ".github/workflows/multi-language-client.yml"
3331
# allow manually run the action:

.github/workflows/compile-check.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ on:
1414
- "iotdb-client/client-cpp/**"
1515
- "example/client-cpp-example/**"
1616
- ".github/workflows/client-cpp-package.yml"
17-
- ".github/workflows/client-cpp-source-build.yml"
1817
- ".github/scripts/package-client-cpp-*.sh"
1918
- ".github/workflows/multi-language-client.yml"
2019
pull_request:
@@ -29,7 +28,6 @@ on:
2928
- "iotdb-client/client-cpp/**"
3029
- "example/client-cpp-example/**"
3130
- ".github/workflows/client-cpp-package.yml"
32-
- ".github/workflows/client-cpp-source-build.yml"
3331
- ".github/scripts/package-client-cpp-*.sh"
3432
- ".github/workflows/multi-language-client.yml"
3533
# allow manually run the action:

.github/workflows/dependency-check.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ on:
1414
- "iotdb-client/client-cpp/**"
1515
- "example/client-cpp-example/**"
1616
- ".github/workflows/client-cpp-package.yml"
17-
- ".github/workflows/client-cpp-source-build.yml"
1817
- ".github/scripts/package-client-cpp-*.sh"
1918
- ".github/workflows/multi-language-client.yml"
2019
pull_request:
@@ -29,7 +28,6 @@ on:
2928
- "iotdb-client/client-cpp/**"
3029
- "example/client-cpp-example/**"
3130
- ".github/workflows/client-cpp-package.yml"
32-
- ".github/workflows/client-cpp-source-build.yml"
3331
- ".github/scripts/package-client-cpp-*.sh"
3432
- ".github/workflows/multi-language-client.yml"
3533
# allow manually run the action:

.github/workflows/multi-language-client.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ on:
1313
- 'iotdb-protocol/thrift-datanode/src/main/thrift/client.thrift'
1414
- 'iotdb-protocol/thrift-commons/src/main/thrift/common.thrift'
1515
- '.github/workflows/multi-language-client.yml'
16-
- '.github/workflows/client-cpp-source-build.yml'
1716
- '.github/workflows/client-cpp-package.yml'
1817
- '.github/scripts/package-client-cpp-*.sh'
1918
pull_request:
@@ -29,7 +28,6 @@ on:
2928
- 'iotdb-protocol/thrift-datanode/src/main/thrift/client.thrift'
3029
- 'iotdb-protocol/thrift-commons/src/main/thrift/common.thrift'
3130
- '.github/workflows/multi-language-client.yml'
32-
- '.github/workflows/client-cpp-source-build.yml'
3331
- '.github/workflows/client-cpp-package.yml'
3432
- '.github/scripts/package-client-cpp-*.sh'
3533
# allow manually run the action:
@@ -65,7 +63,6 @@ jobs:
6563
- 'iotdb-protocol/thrift-datanode/src/main/thrift/client.thrift'
6664
- 'iotdb-protocol/thrift-commons/src/main/thrift/common.thrift'
6765
- '.github/workflows/multi-language-client.yml'
68-
- '.github/workflows/client-cpp-source-build.yml'
6966
- '.github/workflows/client-cpp-package.yml'
7067
- '.github/scripts/package-client-cpp-*.sh'
7168
python:

.github/workflows/pipe-it.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ on:
1212
- "iotdb-client/client-cpp/**"
1313
- "example/client-cpp-example/**"
1414
- ".github/workflows/client-cpp-package.yml"
15-
- ".github/workflows/client-cpp-source-build.yml"
1615
- ".github/scripts/package-client-cpp-*.sh"
1716
- ".github/workflows/multi-language-client.yml"
1817
- "iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/**" #queryengine
@@ -28,7 +27,6 @@ on:
2827
- "iotdb-client/client-cpp/**"
2928
- "example/client-cpp-example/**"
3029
- ".github/workflows/client-cpp-package.yml"
31-
- ".github/workflows/client-cpp-source-build.yml"
3230
- ".github/scripts/package-client-cpp-*.sh"
3331
- ".github/workflows/multi-language-client.yml"
3432
- "iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/**" #queryengine

.github/workflows/sonar-codecov.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ on:
1515
- "iotdb-client/client-cpp/**"
1616
- "example/client-cpp-example/**"
1717
- ".github/workflows/client-cpp-package.yml"
18-
- ".github/workflows/client-cpp-source-build.yml"
1918
- ".github/scripts/package-client-cpp-*.sh"
2019
- ".github/workflows/multi-language-client.yml"
2120
pull_request:
@@ -31,7 +30,6 @@ on:
3130
- "iotdb-client/client-cpp/**"
3231
- "example/client-cpp-example/**"
3332
- ".github/workflows/client-cpp-package.yml"
34-
- ".github/workflows/client-cpp-source-build.yml"
3533
- ".github/scripts/package-client-cpp-*.sh"
3634
- ".github/workflows/multi-language-client.yml"
3735
# allow manually run the action:

0 commit comments

Comments
 (0)