Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/iotdb-tools-thrift-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,11 @@ jobs:
$archive.Dispose()
}

$expectedBinary = if ($classifier.StartsWith("windows")) { "bin/Release/thrift.exe" } else { "bin/thrift" }
$expectedBinary = if ($classifier.StartsWith("windows")) {
"bin/Release/thrift.exe"
} else {
"bin/thrift"
}
Write-Host "Archive: $($zip.Name)"
$files | ForEach-Object { Write-Host " - $_" }

Expand Down Expand Up @@ -170,7 +174,7 @@ jobs:
}
$version = ($version | Select-Object -Last 1).Trim()
Write-Host "Thrift version output: $version"
if ($version -ne "Thrift version 0.23.0") {
if ($version -ne "Thrift version 0.25.0") {
throw "Unexpected thrift version output: $version"
}

Expand Down
2 changes: 1 addition & 1 deletion iotdb-tools-thrift/.mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
2 changes: 1 addition & 1 deletion iotdb-tools-thrift/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ The directory must contain these files:
- `iotdb-tools-thrift-${project.version}-windows-x86_64.zip`
- `iotdb-tools-thrift-${project.version}-windows-aarch64.zip`

`${project.version}` is the Maven project version, for example `0.23.0.0`.
`${project.version}` is the Maven project version, for example `0.25.0.0`.

Verify the archives before deploying them. Each archive should contain only the
`bin/thrift` executable, or `bin/Release/thrift.exe` on Windows, and the
Expand Down
2 changes: 1 addition & 1 deletion iotdb-tools-thrift/README_zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ workflow 会上传一个名为 `iotdb-tools-thrift-all-platforms` 的汇总 arti
- `iotdb-tools-thrift-${project.version}-windows-x86_64.zip`
- `iotdb-tools-thrift-${project.version}-windows-aarch64.zip`

`${project.version}` 是 Maven 项目版本,例如 `0.23.0.0`。
`${project.version}` 是 Maven 项目版本,例如 `0.25.0.0`。

deploy 前请先检查这些压缩包。每个压缩包应当只包含 `bin/thrift` 可执行文件,
Windows 平台为 `bin/Release/thrift.exe`,并且该可执行文件输出的 Apache
Expand Down
48 changes: 31 additions & 17 deletions iotdb-tools-thrift/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
contains nothing else as the compiled thrift binary without any modification.
The fourth segment allows us to re-deploy, if we need to change the config.
-->
<version>0.23.0.0</version>
<version>0.25.0.0</version>
<packaging>pom</packaging>

<name>IoTDB-Tools: Thrift</name>
<description>Local build of the Apache Thrift compiler.</description>

<properties>
<thrift.version>0.23.0</thrift.version>
<thrift.version>0.25.0</thrift.version>
<cmake.generator>Unix Makefiles</cmake.generator>
<cmake.build.type>Release</cmake.build.type>
<prebuilt.artifacts.dir>${project.build.directory}/prebuilt-artifacts</prebuilt.artifacts.dir>
Expand Down Expand Up @@ -76,8 +76,11 @@
</plugin>

<plugin>
<groupId>com.googlecode.cmake-maven-project</groupId>
<groupId>io.github.cmake-maven-plugin</groupId>
<artifactId>cmake-maven-plugin</artifactId>
<configuration>
<downloadBinaries>true</downloadBinaries>
</configuration>
<executions>
<!-- Uses a CMake generator to generate the build using the build tool of choice -->
<execution>
Expand All @@ -89,7 +92,7 @@
<configuration>
<generator>${cmake.generator}</generator>
<sourcePath>${project.build.directory}/thrift-${thrift.version}</sourcePath>
<targetPath>${project.build.directory}/build</targetPath>
<projectDirectory>${project.build.directory}/build</projectDirectory>
<options>
<!-- Disable testing for now -->
<option>-DBUILD_TESTING=OFF</option>
Expand Down Expand Up @@ -202,9 +205,9 @@
<version>1.7.1</version>
</plugin>
<plugin>
<groupId>com.googlecode.cmake-maven-project</groupId>
<groupId>io.github.cmake-maven-plugin</groupId>
<artifactId>cmake-maven-plugin</artifactId>
<version>3.29.3-b2</version>
<version>4.2.3-b1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -273,7 +276,7 @@
<build>
<plugins>
<plugin>
<groupId>com.googlecode.cmake-maven-project</groupId>
<groupId>io.github.cmake-maven-plugin</groupId>
<artifactId>cmake-maven-plugin</artifactId>
<executions>
<!-- Uses a CMake generator to generate the build using the build tool of choice -->
Expand All @@ -286,7 +289,7 @@
<configuration>
<generator>${cmake.generator}</generator>
<sourcePath>${project.build.directory}/thrift-${thrift.version}</sourcePath>
<targetPath>${project.build.directory}/build</targetPath>
<projectDirectory>${project.build.directory}/build</projectDirectory>
<options combine.children="append">
<!-- Tell the linker to build statically linked binaries -->
<option>-DCMAKE_EXE_LINKER_FLAGS=-static</option>
Expand Down Expand Up @@ -316,7 +319,7 @@
<build>
<plugins>
<plugin>
<groupId>com.googlecode.cmake-maven-project</groupId>
<groupId>io.github.cmake-maven-plugin</groupId>
<artifactId>cmake-maven-plugin</artifactId>
<executions>
<!-- Uses a CMake generator to generate the build using the build tool of choice -->
Expand All @@ -329,7 +332,7 @@
<configuration>
<generator>${cmake.generator}</generator>
<sourcePath>${project.build.directory}/thrift-${thrift.version}</sourcePath>
<targetPath>${project.build.directory}/build</targetPath>
<projectDirectory>${project.build.directory}/build</projectDirectory>
<options combine.children="append">
<!-- Tell the linker to build statically linked binaries -->
<option>-DCMAKE_EXE_LINKER_FLAGS=-static</option>
Expand Down Expand Up @@ -358,7 +361,7 @@
<build>
<plugins>
<plugin>
<groupId>com.googlecode.cmake-maven-project</groupId>
<groupId>io.github.cmake-maven-plugin</groupId>
<artifactId>cmake-maven-plugin</artifactId>
<executions>
<!-- Uses a CMake generator to generate the build using the build tool of choice -->
Expand All @@ -371,7 +374,7 @@
<configuration>
<generator>${cmake.generator}</generator>
<sourcePath>${project.build.directory}/thrift-${thrift.version}</sourcePath>
<targetPath>${project.build.directory}/build</targetPath>
<projectDirectory>${project.build.directory}/build</projectDirectory>
<options combine.children="append">
<!-- Specify new version Bison path for Mac-OS, as the default version is too old -->
<option>-DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison</option>
Expand All @@ -398,7 +401,7 @@
<build>
<plugins>
<plugin>
<groupId>com.googlecode.cmake-maven-project</groupId>
<groupId>io.github.cmake-maven-plugin</groupId>
<artifactId>cmake-maven-plugin</artifactId>
<executions>
<!-- Uses a CMake generator to generate the build using the build tool of choice -->
Expand All @@ -411,7 +414,7 @@
<configuration>
<generator>${cmake.generator}</generator>
<sourcePath>${project.build.directory}/thrift-${thrift.version}</sourcePath>
<targetPath>${project.build.directory}/build</targetPath>
<projectDirectory>${project.build.directory}/build</projectDirectory>
<options combine.children="append">
<!-- Specify new version Bison path for Mac-OS, as the default version is too old -->
<option>-DBISON_EXECUTABLE=/opt/homebrew/opt/bison/bin/bison</option>
Expand Down Expand Up @@ -449,9 +452,20 @@
</activation>
<properties>
<os.classifier>windows-aarch64</os.classifier>
<!-- We're using Mingw everywhere else, but it seems boost is not supported for that -->
<cmake.generator>Visual Studio 17 2022</cmake.generator>
<cmake.generator>Visual Studio 18 2026</cmake.generator>
</properties>
<build>
<plugins>
<plugin>
<groupId>io.github.cmake-maven-plugin</groupId>
<artifactId>cmake-maven-plugin</artifactId>
<configuration>
<!-- CMake does not publish Windows ARM64 binaries; use the runner's CMake. -->
<downloadBinaries>false</downloadBinaries>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<profile>
Expand All @@ -469,7 +483,7 @@
</executions>
</plugin>
<plugin>
<groupId>com.googlecode.cmake-maven-project</groupId>
<groupId>io.github.cmake-maven-plugin</groupId>
<artifactId>cmake-maven-plugin</artifactId>
<executions>
<execution>
Expand Down
Loading