From 22b4e553eb01e50622d9e61a5b0f18f0852c0d75 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Thu, 25 May 2023 18:16:11 +0800 Subject: [PATCH] chore: add geos in workflow (#660) * test: install official taospy only in workflows * fix: 2.x-taosbenchmark-debug.yml * test: fix 3.0-non-x64.yml --- .github/workflows/3.0-alpine.yml | 2 +- .github/workflows/3.0-coveralls.yml | 2 +- .github/workflows/3.0-macos-debug.yml | 2 +- .github/workflows/3.0-macos-release.yml | 2 +- .github/workflows/3.0-non-x64.yml | 1 + .github/workflows/3.0-taosbenchmark-debug.yml | 2 +- .github/workflows/3.0-taosbenchmark-release.yml | 2 +- .github/workflows/3.0-taosdump-debug.yml | 4 +++- .github/workflows/3.0-taosdump-release-ws.yml | 4 +++- .github/workflows/3.0-taosdump-release.yml | 4 +++- .github/workflows/codeql.yml | 1 + 11 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/workflows/3.0-alpine.yml b/.github/workflows/3.0-alpine.yml index 360ccbf8..5b99b1b1 100644 --- a/.github/workflows/3.0-alpine.yml +++ b/.github/workflows/3.0-alpine.yml @@ -90,7 +90,7 @@ jobs: || github.event_name == 'schedule' run: | cat /etc/alpine-release - apk add argp-standalone bash curl cmake gcc make g++ git go procps lsof 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++ geos-dev 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 diff --git a/.github/workflows/3.0-coveralls.yml b/.github/workflows/3.0-coveralls.yml index c4252627..8c064d37 100644 --- a/.github/workflows/3.0-coveralls.yml +++ b/.github/workflows/3.0-coveralls.yml @@ -121,7 +121,7 @@ jobs: run: | whoami sudo apt update > /dev/null - sudo apt install libgflags2.2 libgflags-dev -y > /dev/null + sudo apt install libgflags2.2 libgflags-dev libgeos-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 index d56eedc1..9514b448 100644 --- a/.github/workflows/3.0-macos-debug.yml +++ b/.github/workflows/3.0-macos-debug.yml @@ -87,7 +87,7 @@ jobs: || github.event_name == 'schedule' run: | brew update - brew install argp-standalone pkg-config + brew install argp-standalone pkg-config geos 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 index 24af65ac..1fda8b12 100644 --- a/.github/workflows/3.0-macos-release.yml +++ b/.github/workflows/3.0-macos-release.yml @@ -87,7 +87,7 @@ jobs: || github.event_name == 'schedule' run: | brew update - brew install argp-standalone pkg-config + brew install argp-standalone pkg-config geos 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 index fecc4c39..ed645232 100644 --- a/.github/workflows/3.0-non-x64.yml +++ b/.github/workflows/3.0-non-x64.yml @@ -135,6 +135,7 @@ 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 echo "clone TDengine 3.0 on ${{ steps.setup.outputs.uname }}" diff --git a/.github/workflows/3.0-taosbenchmark-debug.yml b/.github/workflows/3.0-taosbenchmark-debug.yml index 0212a4a5..ba31ec4d 100644 --- a/.github/workflows/3.0-taosbenchmark-debug.yml +++ b/.github/workflows/3.0-taosbenchmark-debug.yml @@ -113,7 +113,7 @@ jobs: || github.event_name == 'schedule' run: | sudo apt update > /dev/null - sudo apt install libgflags2.2 libgflags-dev -y > /dev/null + sudo apt install libgeos-dev 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 index b763cc3c..e870eeae 100644 --- a/.github/workflows/3.0-taosbenchmark-release.yml +++ b/.github/workflows/3.0-taosbenchmark-release.yml @@ -113,7 +113,7 @@ jobs: || github.event_name == 'schedule' run: | sudo apt update > /dev/null - sudo apt install libgflags2.2 libgflags-dev -y > /dev/null + sudo apt install libgeos-dev 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 index 3ffafe10..7498acf5 100644 --- a/.github/workflows/3.0-taosdump-debug.yml +++ b/.github/workflows/3.0-taosdump-debug.yml @@ -97,6 +97,8 @@ jobs: || github.event_name == 'push' || github.event_name == 'schedule' run: | + sudo apt update > /dev/null + sudo apt install libgeos-dev libgflags2.2 libgflags-dev -y > /dev/null cd TDengine mkdir debug && cd debug cmake .. -DBUILD_HTTP=false > /dev/null @@ -113,7 +115,7 @@ jobs: && github.event_name == 'pull_request') || github.event_name == 'push' || github.event_name == 'schedule' - run: sudo apt-get install lzma-dev liblzma-dev libjansson-dev libz-dev zlib1g libsnappy-dev pkg-config lcov expect -y > /dev/null + run: sudo apt install lzma-dev libgeos-dev liblzma-dev libjansson-dev libz-dev zlib1g libsnappy-dev pkg-config lcov expect -y > /dev/null - name: Checkout taos-tools to PR number if: | diff --git a/.github/workflows/3.0-taosdump-release-ws.yml b/.github/workflows/3.0-taosdump-release-ws.yml index 5133622c..63932437 100644 --- a/.github/workflows/3.0-taosdump-release-ws.yml +++ b/.github/workflows/3.0-taosdump-release-ws.yml @@ -124,6 +124,8 @@ jobs: || github.event_name == 'push' || github.event_name == 'schedule' run: | + sudo apt update > /dev/null + sudo apt install libgeos-dev libgflags2.2 libgflags-dev -y > /dev/null cd TDengine mkdir debug cd debug @@ -149,7 +151,7 @@ jobs: && github.event_name == 'pull_request') || github.event_name == 'push' || github.event_name == 'schedule' - run: sudo apt-get install lzma-dev liblzma-dev libjansson-dev libz-dev zlib1g libsnappy-dev pkg-config lcov expect -y > /dev/null + run: sudo apt install lzma-dev liblzma-dev libjansson-dev libz-dev zlib1g libsnappy-dev pkg-config lcov expect -y > /dev/null - name: Checkout taos-tools to PR number if: | diff --git a/.github/workflows/3.0-taosdump-release.yml b/.github/workflows/3.0-taosdump-release.yml index d98cef1e..f1d2c5f2 100644 --- a/.github/workflows/3.0-taosdump-release.yml +++ b/.github/workflows/3.0-taosdump-release.yml @@ -97,6 +97,8 @@ jobs: || github.event_name == 'push' || github.event_name == 'schedule' run: | + sudo apt update > /dev/null + sudo apt install libgeos-dev libgflags2.2 libgflags-dev -y > /dev/null cd TDengine mkdir debug && cd debug cmake .. -DBUILD_HTTP=false > /dev/null @@ -113,7 +115,7 @@ jobs: && github.event_name == 'pull_request') || github.event_name == 'push' || github.event_name == 'schedule' - run: sudo apt-get install lzma-dev liblzma-dev libjansson-dev libz-dev zlib1g libsnappy-dev pkg-config lcov expect -y > /dev/null + run: sudo apt install lzma-dev liblzma-dev libjansson-dev libz-dev zlib1g libsnappy-dev pkg-config lcov expect -y > /dev/null - name: Checkout taos-tools to PR number if: | diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 77778846..02ac9f01 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -57,6 +57,7 @@ jobs: run: | sudo apt update -y > /dev/null sudo apt install -y cmake build-essential git \ + libgeos-dev libgflags2.2 libgflags-dev \ libjansson-dev libsnappy-dev liblzma-dev libz-dev pkg-config \ libssl-dev > /dev/null