diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 54f87d88e..b642b698f 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -16,6 +16,8 @@ jobs: steps: - uses: actions/checkout@v1 - uses: xmake-io/github-action-setup-xmake@v1 + with: + xmake-version: branch@dev - name: Update git submodule run: | @@ -86,14 +88,14 @@ jobs: - name: Package run: | - xmake package -v + xmake package xmake install -o dist/lcui-package - name: Build examples run: | cd examples - xmake config -P . -y -v - xmake build -P . -v + xmake config -P . -y + xmake build -P . xmake install -P . -o ../dist/lcui-examples mv ../dist/lcui-examples/bin/* ../dist/lcui-examples/ rm -r ../dist/lcui-examples/bin diff --git a/xmake-requires.lock b/xmake-requires.lock index eece1c575..a9e86ce63 100644 --- a/xmake-requires.lock +++ b/xmake-requires.lock @@ -240,7 +240,7 @@ ["cmake#31fecfc4"] = { repo = { branch = "master", - commit = "063862d6bd80b41cee3bf3e093941724e1e86e3b", + commit = "123ec42158b7bbf0ce3b143c046ccc5033cf2121", url = "https://gitee.com/tboox/xmake-repo.git" }, version = "3.28.3-msvc11" @@ -264,26 +264,26 @@ ["libomp#31fecfc4"] = { repo = { branch = "master", - commit = "063862d6bd80b41cee3bf3e093941724e1e86e3b", + commit = "123ec42158b7bbf0ce3b143c046ccc5033cf2121", url = "https://gitee.com/tboox/xmake-repo.git" }, - version = "12.0.1" + version = "19.1.0" }, ["libpng#31fecfc4"] = { repo = { branch = "master", - commit = "570c9dfab7fafab1515cf3cd1c9fa76a68ef195a", + commit = "123ec42158b7bbf0ce3b143c046ccc5033cf2121", url = "https://gitee.com/tboox/xmake-repo.git" }, - version = "v1.6.43" + version = "v1.6.44" }, ["libxml2#31fecfc4"] = { repo = { branch = "master", - commit = "063862d6bd80b41cee3bf3e093941724e1e86e3b", + commit = "123ec42158b7bbf0ce3b143c046ccc5033cf2121", url = "https://gitee.com/tboox/xmake-repo.git" }, - version = "2.13.2" + version = "v2.13.4" }, ["libyaml#31fecfc4"] = { repo = { @@ -301,6 +301,14 @@ }, version = "2.0.3" }, + ["python 3.x#31fecfc4"] = { + repo = { + branch = "master", + commit = "123ec42158b7bbf0ce3b143c046ccc5033cf2121", + url = "https://gitee.com/tboox/xmake-repo.git" + }, + version = "3.12.3" + }, ["zlib#31fecfc4"] = { repo = { branch = "master",