Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: add geos in workflow #660

Merged
merged 5 commits into from
May 25, 2023
Merged

chore: add geos in workflow #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f8c7fcc
test: install official taospy only in workflows
sangshuduo Apr 30, 2023
adc2943
fix: 2.x-taosbenchmark-debug.yml
sangshuduo Apr 30, 2023
9b757fe
Merge branch 'develop' into test/sangshuduo/refine-workflow
sangshuduo Apr 30, 2023
1da03aa
test: fix 3.0-non-x64.yml
sangshuduo Apr 30, 2023
dd5750f
chore: workflow add geos
sangshuduo May 25, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/3.0-alpine.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/3.0-coveralls.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/3.0-macos-debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/3.0-macos-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/3.0-non-x64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/3.0-taosbenchmark-debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/3.0-taosbenchmark-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/3.0-taosdump-debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/3.0-taosdump-release-ws.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/3.0-taosdump-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down