Skip to content

Commit

Permalink
Merge pull request #713 from taosdata/feat/TD-26563-MAIN
Browse files Browse the repository at this point in the history
feat: add  partialColFrom and sawTooth square
  • Loading branch information
DuanKuanJun committed Oct 23, 2023
2 parents 93c48d1 + 09e2497 commit bcf936d
Show file tree
Hide file tree
Showing 11 changed files with 387 additions and 401 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/2.x-aarch64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
distro: ubuntu22.04
run: |
apt update -y > /dev/null
apt install git cmake build-essential libjansson-dev libsnappy-dev liblzma-dev libz-dev zlib1g pkg-config -y > /dev/null
apt install git cmake build-essential libexpat1-dev libjansson-dev libsnappy-dev liblzma-dev libz-dev zlib1g pkg-config -y > /dev/null
cd TDengine
mkdir debug ||:
Expand Down
123 changes: 0 additions & 123 deletions .github/workflows/3.0-alpine.yml

This file was deleted.

206 changes: 0 additions & 206 deletions .github/workflows/3.0-archlinux-release.yml

This file was deleted.

4 changes: 1 addition & 3 deletions .github/workflows/3.0-non-x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@ on:
# Triggers the workflow on push or pull request events but only for the develop branch
push:
branches:
- develop
- 3.0
- main
pull_request:
branches:
- develop
- 3.0
- main

Expand Down Expand Up @@ -140,7 +138,7 @@ jobs:
run: |
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 -y cmake libexpat1-dev build-essential git libjansson-dev libsnappy-dev liblzma-dev libz-dev zlib1g pkg-config libssl-dev > /dev/null
apt install libgflags2.2 libgflags-dev -y > /dev/null
echo "clone TDengine ${{ github.event.pull_request.base.ref }} on ${{ steps.setup.outputs.uname }}"
Expand Down
Loading

0 comments on commit bcf936d

Please sign in to comment.