Merge branch 'master' of https://github.com/sogou/workflow

sogou · Jan 3, 2023 · 190c007 · 190c007
2 parents 873ff91 + 4216034
commit 190c007
Show file tree

Hide file tree

Showing 24 changed files with 592 additions and 644 deletions.
diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml
@@ -31,7 +31,7 @@ jobs:
 
     - name : run shared
       run: |
-        xmake f --type=shared
+        xmake f -k shared
         xmake -r
         xmake -g test
         xmake -g tutorial

diff --git a/.gitignore b/.gitignore
@@ -41,3 +41,8 @@ bazel-*
 .idea
 cmake-build-debug/
 workflow-config.cmake
+
+# xmake configs
+.xmake
+build.xmake
+_include
diff --git a/BUILD b/BUILD
@@ -263,6 +263,7 @@ cc_library(
 	],
 	deps = [
 		':common',
+		':http',
 	],
 	visibility = ["//visibility:public"],
 )

diff --git a/README.md b/README.md
@@ -73,7 +73,7 @@ To install the Workflow library for deployment:
 sudo apt-get install libworkflow1
 ~~~~
 
-### Get stated (xmake)
+### Get started (xmake)
 
 If you want to use xmake to build workflow, you can see [xmake build document](docs/en/xmake.md)
 

diff --git a/benchmark/xmake.lua b/benchmark/xmake.lua
@@ -3,7 +3,7 @@ set_default(false)
 
 add_deps("workflow")
 
-if not is_os("macosx") then
+if not is_plat("macosx") then
     add_ldflags("-lrt")
 end
 

diff --git a/docs/en/about-timeout.md b/docs/en/about-timeout.md