From 30be4ff9a0291a91c4df172db179d5255688accc Mon Sep 17 00:00:00 2001 From: HTHou Date: Thu, 25 Apr 2024 17:19:19 +0800 Subject: [PATCH] helishi --- .github/workflows/main.yml | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ccdfa53..bd02083 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,12 +1,12 @@ -# Build iotdb-rel/0.13, iotdb-rel/1.0, master, iot-benchmark +# Build iotdb-rel/0.13, iotdb-rel/1.0, helishi_client, iot-benchmark # Everyday name: iotdb 每日发布 on: # push: # branches: -# - master - schedule: - - cron: "0 12 * * *" +# - helishi_client +# schedule: +# - cron: "0 12 * * *" workflow_dispatch: jobs: @@ -61,7 +61,7 @@ jobs: fail-fast: false max-parallel: 20 matrix: - iotdb_version: [ rel/0.13,rel/1.1,rel/1.2,master ] + iotdb_version: [ rel/0.13,rel/1.1,rel/1.2,helishi_client ] java_version: [ 8,11 ] os: [ windows-2022 ] runs-on: ${{ matrix.os }} @@ -73,13 +73,13 @@ jobs: distribution: 'zulu' - name: download & unpack & install -> boost - if: ${{ matrix.os == 'windows-2022' && matrix.iotdb_version != 'master' }} + if: ${{ matrix.os == 'windows-2022' && matrix.iotdb_version != 'helishi_client' }} shell: cmd run: | C:\msys64\usr\bin\wget.exe -O ${{ github.workspace }}/boost_1_78_0-bin.7z https://github.com/xiaoyekanren/iotdb-daily-build-dependence/releases/download/release-depend-bin/boost_1_78_0-bin.7z 7z x ${{ github.workspace }}/boost_1_78_0-bin.7z -o${{ github.workspace }}/boost_1_78_0 - name: download & unpack & install -> boost - if: ${{ matrix.os == 'windows-2022' && matrix.iotdb_version == 'master' }} + if: ${{ matrix.os == 'windows-2022' && matrix.iotdb_version == 'helishi_client' }} shell: cmd run: choco install boost-msvc-14.3 --version=1.78.0 @@ -90,7 +90,7 @@ jobs: 7z x ${{ github.workspace }}/win_flex_bison-latest.zip -o${{ github.workspace }}/win_flex_bison-latest - name: download & unpack mvn3.9.x - if: ${{ matrix.os == 'windows-2022' && matrix.iotdb_version == 'master' }} + if: ${{ matrix.os == 'windows-2022' && matrix.iotdb_version == 'helishi_client' }} shell: cmd run: | C:\msys64\usr\bin\wget.exe -O ${{ github.workspace }}/apache-maven-3.9.4-bin.zip https://dlcdn.apache.org/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.zip @@ -120,7 +120,7 @@ jobs: echo "commit=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT" echo "branch=$(git branch |grep ^*|cut -d ' ' -f 2|sed "s:/:-:")" >> $GITHUB_OUTPUT echo "version=$(cat pom.xml | grep -e '^ ' | sed 's# ##g' | sed 's###g' | sed 's###g')" >> "$GITHUB_OUTPUT" - # To distinguish master and rel/1.0 branches, add temporary variables + # To distinguish helishi_client and rel/1.0 branches, add temporary variables echo "matrix_version=$(echo ${{ matrix.iotdb_version }} | sed "s:/::")" >> "$GITHUB_OUTPUT" # boost @@ -129,7 +129,7 @@ jobs: # echo "cmake_url=https://github.com/Kitware/CMake/releases/download/v3.23.1/cmake-3.23.1-windows-x86_64.zip" >> "$GITHUB_OUTPUT" - if [ "${{ matrix.iotdb_version }}" = "master" ]; then + if [ "${{ matrix.iotdb_version }}" = "helishi_client" ]; then echo "server_dir=iotdb-core/datanode" >> "$GITHUB_OUTPUT" echo "cpp_dir=iotdb-client\client-cpp" >> "$GITHUB_OUTPUT" echo "cmake_root_dir=${{ github.workspace }}\iotdb\iotdb-client\compile-tools\thrift\target\cmake-3.23.1-windows-x86_64" >> "$GITHUB_OUTPUT" @@ -152,7 +152,7 @@ jobs: # fi # build client-cpp - name: Build client-cpp on ${{ matrix.iotdb_version }} branch - if: ${{ matrix.os == 'windows-2022' && matrix.iotdb_version == 'master' }} + if: ${{ matrix.os == 'windows-2022' && matrix.iotdb_version == 'helishi_client' }} shell: cmd run: | cd ${{ github.workspace }}\iotdb @@ -173,7 +173,7 @@ jobs: # setx Boost_INCLUDE_DIR ${{ steps.iotdb-info.outputs.boost_include_dir }} # setx Boost_LIBRARY_DIR ${{ steps.iotdb-info.outputs.boost_library_dir }} - name: Build client-cpp on ${{ matrix.iotdb_version }} branch - if: ${{ matrix.os == 'windows-2022' && matrix.iotdb_version != 'master' }} + if: ${{ matrix.os == 'windows-2022' && matrix.iotdb_version != 'helishi_client' }} shell: cmd run: | cd ${{ github.workspace }}\iotdb @@ -235,7 +235,7 @@ jobs: fail-fast: false max-parallel: 20 matrix: - iotdb_version: [ rel/0.13,rel/1.1,rel/1.2,master ] + iotdb_version: [ rel/0.13,rel/1.1,rel/1.2,helishi_client ] java_version: [ 8,11 ] maven_version: [ '3.9.5' ] os: [ ubuntu-22.04 ] @@ -270,10 +270,10 @@ jobs: echo "commit=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT echo "branch=$(git branch |grep ^*|cut -d ' ' -f 2|sed "s:/:-:")" >> $GITHUB_OUTPUT echo "version=$(cat pom.xml | grep -e '^ ' | sed 's# ##g' | sed 's###g' | sed 's###g')" >> $GITHUB_OUTPUT - # To distinguish master and rel/1.0 branches, add temporary variables + # To distinguish helishi_client and rel/1.0 branches, add temporary variables echo "matrix_version=$(echo ${{ matrix.iotdb_version }} | sed "s:/::")" >> $GITHUB_OUTPUT - if [ "${{ matrix.iotdb_version }}" = "master" ]; then + if [ "${{ matrix.iotdb_version }}" = "helishi_client" ]; then echo "client_jdbc_module=iotdb-client/jdbc" >> "$GITHUB_OUTPUT" echo "client_py_module=iotdb-client/client-py" >> "$GITHUB_OUTPUT" echo "client_cpp_module=iotdb-client/client-cpp" >> "$GITHUB_OUTPUT" @@ -303,7 +303,7 @@ jobs: shell: bash run: | cd ${{ github.workspace }}/iotdb - if [ "${{ matrix.iotdb_version }}" = "master" ]; then + if [ "${{ matrix.iotdb_version }}" = "helishi_client" ]; then mvn clean package -DskipTests -am -pl ${{ steps.iotdb-info.outputs.client_jdbc_module }},${{ steps.iotdb-info.outputs.client_py_module }},${{ steps.iotdb-info.outputs.client_cpp_module }},${{ steps.iotdb-info.outputs.client_cpp_example_module }},distribution -P get-jar-with-dependencies,with-cpp else mvn clean package -DskipTests -am -pl ${{ steps.iotdb-info.outputs.client_jdbc_module }},${{ steps.iotdb-info.outputs.client_py_module }},${{ steps.iotdb-info.outputs.client_cpp_module }},${{ steps.iotdb-info.outputs.client_cpp_example_module }},distribution -P get-jar-with-dependencies,compile-grafana-plugin,compile-cpp @@ -349,9 +349,9 @@ jobs: # 20231219,compile grafana module will fail, so it will no longer be compiled # mvn clean package -DskipTests -am -pl ${{ steps.iotdb-info.outputs.client_jdbc_module }},${{ steps.iotdb-info.outputs.client_py_module }},distribution -P get-jar-with-dependencies,with-grafana-plugin # -#upload on master +#upload on helishi_client - name: Upload distribution on ${{ steps.iotdb-info.outputs.branch }} using ${{ matrix.java_version }} - if: ${{ matrix.iotdb_version == 'master' }} + if: ${{ matrix.iotdb_version == 'helishi_client' }} uses: ncipollo/release-action@v1.13.0 with: token: ${{ secrets.GITHUB_TOKEN }} @@ -365,7 +365,7 @@ jobs: artifacts: "${{ github.workspace }}/apache-iotdb-all-bin-${{ steps.iotdb-info.outputs.branch }}-${{ steps.iotdb-info.outputs.version }}-${{ steps.iotdb-info.outputs.commit }}.zip,${{ github.workspace }}/apache-iotdb-jdbc-${{ steps.iotdb-info.outputs.branch }}-${{ steps.iotdb-info.outputs.version }}-${{ steps.iotdb-info.outputs.commit }}-jar-with-dependencies.jar,${{ github.workspace }}/apache_iotdb-${{ steps.iotdb-info.outputs.branch }}-${{ steps.iotdb-info.outputs.version }}-${{ steps.iotdb-info.outputs.commit }}-py2.py3-none-any.whl,${{ github.workspace }}/apache-iotdb-client-cpp-${{ matrix.os }}-x86_64-${{ steps.iotdb-info.outputs.branch }}-${{ steps.iotdb-info.outputs.version }}-${{ steps.iotdb-info.outputs.commit }}.zip,${{ github.workspace }}/apache-iotdb-client-cpp-example-${{ matrix.os }}-x86_64-${{ steps.iotdb-info.outputs.version }}-${{ steps.iotdb-info.outputs.matrix_version }}-${{ steps.iotdb-info.outputs.commit }}.zip" #upload on other branch - name: Upload distribution on ${{ steps.iotdb-info.outputs.branch }} using ${{ matrix.java_version }} - if: ${{ matrix.iotdb_version != 'master' }} + if: ${{ matrix.iotdb_version != 'helishi_client' }} uses: ncipollo/release-action@v1.13.0 with: token: ${{ secrets.GITHUB_TOKEN }} @@ -402,7 +402,7 @@ jobs: with: path: iot-benchmark repository: 'thulab/iot-benchmark' - ref: master + ref: helishi_client fetch-depth: 0 - name: Collect benchmark info id: benchmark-info