未验证 提交 7f77f036 编写于 作者: sangshuduo's avatar sangshuduo 提交者: GitHub

Hotfix/sangshuduo/td 4025 fix travis ci broken for develop (#6376)

* [TD-4025]<fix>: travis ci broken due to valgrind dependency missed.

modify smoketest.sh to python3.8

* [TD-4025]<fix>: travis ci broken due to ubuntu 20.04 repo issue.

* [TD-4025]<fix>: travis ci broken due to ubuntu 20.04 repo issue.

* [TD-4025]<fix>: travis ci broken due to ubuntu 20.04 repo issue.

* [TD-4025]<fix>: travis ci broken due to valgrind dependency missed.

change focal to bionic.

* [TD-4025]<fix>: travis ci broken due to ubuntu 20.04 repo issue.

cherry pick from master.

* don't check maven on windows for appveyor.

* fix timezone build error with clang/linux.

* add .appveyor.yml back.
Co-authored-by: NShuduo Sang <sdsang@taosdata.com>
上级 ecbc6108
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
*/ */
int64_t user_mktime64(const unsigned int year0, const unsigned int mon0, int64_t user_mktime64(const unsigned int year0, const unsigned int mon0,
const unsigned int day, const unsigned int hour, const unsigned int day, const unsigned int hour,
const unsigned int min, const unsigned int sec, int64_t timezone) const unsigned int min, const unsigned int sec, int64_t time_zone)
{ {
unsigned int mon = mon0, year = year0; unsigned int mon = mon0, year = year0;
...@@ -61,7 +61,7 @@ int64_t user_mktime64(const unsigned int year0, const unsigned int mon0, ...@@ -61,7 +61,7 @@ int64_t user_mktime64(const unsigned int year0, const unsigned int mon0,
res = res*24; res = res*24;
res = ((res + hour) * 60 + min) * 60 + sec; res = ((res + hour) * 60 + min) * 60 + sec;
return (res + timezone); return (res + time_zone);
} }
// ==== mktime() kernel code =================// // ==== mktime() kernel code =================//
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册