fix: taosdump remove unused --yes (#673) (#674)

* fix: taosdump remove unused --yes * test: change workflow branch * fix: taosdump old test * fix: 3.0-windows-build.yml jom concurrent Co-authored-by: Hui Li <[email protected]> Co-authored-by: wade zhang <[email protected]>
taosdata · Jun 9, 2023 · 50c259c · 50c259c
1 parent a5ae6d9
commit 50c259c
Show file tree

Hide file tree

Showing 21 changed files with 173 additions and 96 deletions.
diff --git a/.github/workflows/2.x-archlinux-release.yml b/.github/workflows/2.x-archlinux-release.yml
@@ -16,8 +16,6 @@ jobs:
   check-changed:
     runs-on: ubuntu-latest
     outputs:
-      output1: ${{ steps.step1.outputs.test }}
-      output2: ${{ steps.step2.outputs.test }}
       changedflag: ${{ steps.changedflag.outputs.changedflag }}
     steps:
       - name: Step that prints name of pull request's base branch

diff --git a/.github/workflows/2.x-centos-release.yml b/.github/workflows/2.x-centos-release.yml
@@ -16,8 +16,6 @@ jobs:
   check-changed:
     runs-on: ubuntu-latest
     outputs:
-      output1: ${{ steps.step1.outputs.test }}
-      output2: ${{ steps.step2.outputs.test }}
       changedflag: ${{ steps.changedflag.outputs.changedflag }}
     steps:
       - name: Step that prints name of pull request's base branch

diff --git a/.github/workflows/3.0-alpine.yml b/.github/workflows/3.0-alpine.yml
@@ -4,9 +4,15 @@ on:
   schedule:
     - cron: "10 16 * * *"
   push:
-    branches: [ develop ]
+    branches:
+      - develop
+      - 3.0
+      - main
   pull_request:
-    branches: [ develop ]
+    branches:
+      - develop
+      - 3.0
+      - main
 
 env:
   TOOLS_BUILD_TYPE: Release
@@ -90,7 +96,7 @@ jobs:
           || github.event_name == 'schedule'
         run: |
           cat /etc/alpine-release
-          apk add argp-standalone bash curl cmake gcc g++ geos-dev git go procps lsof make valgrind linux-headers libunwind libunwind-dev tzdata wget jansson-dev snappy-dev xz-dev zlib-dev
+          apk add argp-standalone bash curl cmake gcc g++ git go procps lsof make valgrind linux-headers libunwind libunwind-dev tzdata wget jansson-dev snappy-dev xz-dev zlib-dev
         shell: alpine.sh --root {0}
 
       - name: Build & Install TDengine
@@ -101,8 +107,7 @@ jobs:
           || github.event_name == 'schedule'
         shell: alpine.sh --root {0}
         run: |
-
-          git clone --branch main --depth 1 https://github.com/taosdata/TDengine > /dev/null || exit 1
+          git clone --branch ${{ github.event.pull_request.base.ref }} --depth 1 https://github.com/taosdata/TDengine > /dev/null || exit 1
           cd TDengine && mkdir debug && cd debug && cmake .. -DBUILD_TOOLS=true -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} -DBUILD_HTTP=false && make -j2 && make install
           if [[ ! -f /usr/local/taos/bin/taosd ]] || [[ ! -f /usr/local/taos/bin/taos ]]
           then

diff --git a/.github/workflows/3.0-archlinux-release.yml b/.github/workflows/3.0-archlinux-release.yml
@@ -4,9 +4,15 @@ on:
   schedule:
     - cron: "10 16 * * *"
   push:
-    branches: [ develop ]
+    branches:
+      - develop
+      - 3.0
+      - main
   pull_request:
-    branches: [ develop ]
+    branches:
+      - develop
+      - 3.0
+      - main
 
 env:
   TOOLS_BUILD_TYPE: Release
@@ -85,9 +91,9 @@ jobs:
           || github.event_name == 'schedule'
         run: |
           pacman -Syu --noconfirm > /dev/null
-          pacman -Sy git geos --noconfirm > /dev/null
+          pacman -Sy git --noconfirm > /dev/null
 
-      - name: Checkout TDengine 3.0 branch
+      - name: Checkout TDengine
         if: |
           (needs.check-changed.outputs.changedflag == 'true'
           && github.event_name == 'pull_request')
@@ -98,7 +104,7 @@ jobs:
           submodules: recursive
           repository: 'taosdata/TDengine'
           path: 'TDengine'
-          ref: '3.0'
+          ref: ${{ github.event.pull_request.base.ref }}
 
       - name: Change time zone
         if: |

diff --git a/.github/workflows/3.0-coveralls.yml b/.github/workflows/3.0-coveralls.yml
@@ -1,9 +1,15 @@
 name: Coveralls (3.0)
 on:
   push:
-    branches: [ develop ]
+    branches:
+      - develop
+      - 3.0
+      - main
   pull_request:
-    branches: [ develop ]
+    branches:
+      - develop
+      - 3.0
+      - main
 
 env:
   TOOLS_BUILD_TYPE: Debug
@@ -61,7 +67,7 @@ jobs:
         run: |
           echo "One or more files listed above has changed."
 
-      - name: Checkout TDengine 3.0
+      - name: Checkout TDengine
         if:
           (steps.changed-files-specific.outputs.any_changed == 'true'
           && github.event_name == 'pull_request')
@@ -71,7 +77,7 @@ jobs:
         with:
           repository: 'taosdata/TDengine'
           path: 'TDengine'
-          ref: '3.0'
+          ref: ${{ github.event.pull_request.base.ref }}
 
       - name: Change time zone
         if:
@@ -112,7 +118,7 @@ jobs:
             TDengine/tools/taosws-rs/target/
           key: ${{ runner.os }}-cargo-target-${{ steps.setup-rust.outputs.rustc_hash }}
 
-      - name: first build TDengine 3.0
+      - name: first build TDengine
         if: |
           (steps.changed-files-specific.outputs.any_changed == 'true'
           && github.event_name == 'pull_request')
@@ -121,7 +127,7 @@ jobs:
         run: |
           whoami
           sudo apt update > /dev/null
-          sudo apt install libgflags2.2 libgflags-dev libgeos-dev -y > /dev/null
+          sudo apt install libgflags2.2 libgflags-dev -y > /dev/null
           cd TDengine
           mkdir debug ||:
           cd debug

diff --git a/.github/workflows/3.0-macos-debug.yml b/.github/workflows/3.0-macos-debug.yml
@@ -4,9 +4,15 @@ on:
   schedule:
     - cron: "10 16 * * *"
   push:
-    branches: [ develop ]
+    branches:
+      - develop
+      - 3.0
+      - main
   pull_request:
-    branches: [ develop ]
+    branches:
+      - develop
+      - 3.0
+      - main
 
 env:
   TOOLS_BUILD_TYPE: Debug
@@ -57,7 +63,7 @@ jobs:
         run: |
           echo "One or more files listed above has changed."
 
-      - name: Checkout TDengine 3.0
+      - name: Checkout TDengine
         if: |
           (steps.changed-files-specific.outputs.any_changed == 'true'
           && github.event_name == 'pull_request')
@@ -67,7 +73,7 @@ jobs:
         with:
           repository: 'taosdata/TDengine'
           path: 'TDengine'
-          ref: '3.0'
+          ref: ${{ github.event.pull_request.base.ref }}
 
       - name: Change time zone
         if: |
@@ -87,7 +93,7 @@ jobs:
           || github.event_name == 'schedule'
         run: |
           brew update
-          brew install argp-standalone pkg-config geos
+          brew install argp-standalone pkg-config
           brew info argp-standalone
 
       - name: Set up Go

diff --git a/.github/workflows/3.0-macos-release.yml b/.github/workflows/3.0-macos-release.yml
@@ -4,9 +4,15 @@ on:
   schedule:
     - cron: "10 16 * * *"
   push:
-    branches: [ develop ]
+    branches:
+      - develop
+      - 3.0
+      - main
   pull_request:
-    branches: [ develop ]
+    branches:
+      - develop
+      - 3.0
+      - main
 
 env:
   TOOLS_BUILD_TYPE: Release
@@ -57,7 +63,7 @@ jobs:
         run: |
           echo "One or more files listed above has changed."
 
-      - name: Checkout TDengine 3.0
+      - name: Checkout TDengine
         if: |
           (steps.changed-files-specific.outputs.any_changed == 'true'
           && github.event_name == 'pull_request')
@@ -67,7 +73,7 @@ jobs:
         with:
           repository: 'taosdata/TDengine'
           path: 'TDengine'
-          ref: '3.0'
+          ref: ${{ github.event.pull_request.base.ref }}
 
       - name: Change time zone
         if: |
@@ -87,7 +93,7 @@ jobs:
           || github.event_name == 'schedule'
         run: |
           brew update
-          brew install argp-standalone pkg-config geos
+          brew install argp-standalone pkg-config
           brew info argp-standalone
 
       - name: Set up Go

diff --git a/.github/workflows/3.0-non-x64.yml b/.github/workflows/3.0-non-x64.yml
@@ -8,9 +8,15 @@ on:
     - cron: "10 16 * * *"
   # Triggers the workflow on push or pull request events but only for the develop branch
   push:
-    branches: [ develop ]
+    branches:
+      - develop
+      - 3.0
+      - main
   pull_request:
-    branches: [ develop ]
+    branches:
+      - develop
+      - 3.0
+      - main
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -135,11 +141,11 @@ jobs:
             echo "Install packages on ${{ steps.setup.outputs.uname }}"
             apt update -y > /dev/null
             apt install -y cmake build-essential git libjansson-dev libsnappy-dev liblzma-dev libz-dev zlib1g pkg-config libssl-dev > /dev/null
-            apt install libgeos-dev libgflags2.2 libgflags-dev -y > /dev/null
+            apt install libgflags2.2 libgflags-dev -y > /dev/null
 
-            echo "clone TDengine 3.0 on ${{ steps.setup.outputs.uname }}"
+            echo "clone TDengine ${{ github.event.pull_request.base.ref }} on ${{ steps.setup.outputs.uname }}"
 
-            git clone --branch 3.0 --depth 1 https://github.com/taosdata/TDengine > /dev/null || exit 1
+            git clone --branch ${{ github.event.pull_request.base.ref }} --depth 1 https://github.com/taosdata/TDengine > /dev/null || exit 1
 
             echo "build TDengine 3.0 on ${{ steps.setup.outputs.uname }}"
             cd TDengine || exit 1

diff --git a/.github/workflows/3.0-taosbenchmark-debug.yml b/.github/workflows/3.0-taosbenchmark-debug.yml
@@ -4,9 +4,15 @@ on:
   schedule:
     - cron: "10 16 * * *"
   push:
-    branches: [ develop ]
+    branches:
+      - develop
+      - 3.0
+      - main
   pull_request:
-    branches: [ develop ]
+    branches:
+      - develop
+      - 3.0
+      - main
 
 env:
   TOOLS_BUILD_TYPE: Debug
@@ -58,12 +64,12 @@ jobs:
         run: |
           echo "One or more files listed above has changed."
 
-      - name: Checkout TDengine 3.0
+      - name: Checkout TDengine
         uses: actions/checkout@v2
         with:
           repository: 'taosdata/TDengine'
           path: 'TDengine'
-          ref: '3.0'
+          ref: ${{ github.event.pull_request.base.ref }}
 
       - name: Change time zone
         if: |
@@ -113,7 +119,7 @@ jobs:
           || github.event_name == 'schedule'
         run: |
           sudo apt update > /dev/null
-          sudo apt install libgeos-dev libgflags2.2 libgflags-dev -y > /dev/null
+          sudo apt install libgflags2.2 libgflags-dev -y > /dev/null
           cd TDengine && mkdir debug && cd debug \
             && cmake .. -DBUILD_HTTP=false -DWEBSOCKET=true > /dev/null \
             && make -j2 > /dev/null && sudo make install > /dev/null \

diff --git a/.github/workflows/3.0-taosbenchmark-release.yml b/.github/workflows/3.0-taosbenchmark-release.yml
@@ -4,9 +4,15 @@ on:
   schedule:
     - cron: "10 16 * * *"
   push:
-    branches: [ develop ]
+    branches:
+      - develop
+      - 3.0
+      - main
   pull_request:
-    branches: [ develop ]
+    branches:
+      - develop
+      - 3.0
+      - main
 
 env:
   TOOLS_BUILD_TYPE: Release
@@ -58,12 +64,12 @@ jobs:
         run: |
           echo "One or more files listed above has changed."
 
-      - name: Checkout TDengine 3.0
+      - name: Checkout TDengine
         uses: actions/checkout@v2
         with:
           repository: 'taosdata/TDengine'
           path: 'TDengine'
-          ref: '3.0'
+          ref: ${{ github.event.pull_request.base.ref }}
 
       - name: Change time zone
         if: |
@@ -113,7 +119,7 @@ jobs:
           || github.event_name == 'schedule'
         run: |
           sudo apt update > /dev/null
-          sudo apt install libgeos-dev libgflags2.2 libgflags-dev -y > /dev/null
+          sudo apt install libgflags2.2 libgflags-dev -y > /dev/null
           cd TDengine && mkdir debug && cd debug \
             && cmake .. -DBUILD_HTTP=false -DWEBSOCKET=true > /dev/null \
             && make -j2 > /dev/null && sudo make install > /dev/null \

diff --git a/.github/workflows/3.0-taosdump-debug.yml b/.github/workflows/3.0-taosdump-debug.yml
@@ -4,9 +4,15 @@ on:
   schedule:
     - cron: "10 16 * * *"
   push:
-    branches: [ develop ]
+    branches:
+      - develop
+      - 3.0
+      - main
   pull_request:
-    branches: [ develop ]
+    branches:
+      - develop
+      - 3.0
+      - main
 
 env:
   TOOLS_BUILD_TYPE: Debug
@@ -58,7 +64,7 @@ jobs:
         run: |
           echo "One or more files listed above has changed."
 
-      - name: Checkout tdengine
+      - name: Checkout TDengine
         if:
           (steps.changed-files-specific.outputs.any_changed == 'true'
           && github.event_name == 'pull_request')
@@ -68,7 +74,7 @@ jobs:
         with:
           repository: 'taosdata/TDengine'
           path: 'TDengine'
-          ref: '3.0'
+          ref: ${{ github.event.pull_request.base.ref }}
 
       - name: Change time zone
         if:
@@ -98,7 +104,7 @@ jobs:
           || github.event_name == 'schedule'
         run: |
           sudo apt update > /dev/null
-          sudo apt install libgeos-dev libgflags2.2 libgflags-dev -y > /dev/null
+          sudo apt install libgflags2.2 libgflags-dev -y > /dev/null
           cd TDengine
           mkdir debug && cd debug
           cmake .. -DBUILD_HTTP=false > /dev/null