[73_6] lock requires on linux

XmacsLabs · Jan 9, 2024 · 02bec5e · 02bec5e
1 parent 42dab5d
commit 02bec5e
Show file tree

Hide file tree

Showing 3 changed files with 140 additions and 5 deletions.
diff --git a/.github/workflows/ci-xmake-ubuntu.yml b/.github/workflows/ci-xmake-ubuntu.yml
@@ -13,6 +13,7 @@ on:
       - 'xmake.lua'
       - 'xmake/packages.lua'
       - 'xmake/research.lua'
+      - 'xmake-requires.lock'
   pull_request:
     branches: [ branch-1.2 ]
     paths:
@@ -25,6 +26,7 @@ on:
       - 'xmake.lua'
       - 'xmake/packages.lua'
       - 'xmake/research.lua'
+      - 'xmake-requires.lock'
 
 jobs:
   linuxbuild:
@@ -67,14 +69,14 @@ jobs:
         with:
           path: |
             ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages 
-          key: ${{ runner.os }}-xrepo-qt${{ matrix.qt_ver }}-${{ hashFiles('**/packages.lua') }}
+          key: ${{ runner.os }}-xrepo-qt${{ matrix.qt_ver }}-${{ hashFiles('xmake-requires.lock') }}
 
       - name: cache xmake
         uses: actions/cache@v3
         with:
           path: |
             ${{ runner.workspace }}/build/.build_cache
-          key: ${{ runner.os }}-build-qt${{ matrix.qt_ver }}-${{ hashFiles('**/xmake.lua') }}
+          key: ${{ runner.os }}-build-qt${{ matrix.qt_ver }}-${{ hashFiles('xmake-requires.lock') }}
 
       - name: config
         run: xmake config --policies=build.ccache -o ${{ runner.workspace }}/build -m releasedbg --yes

diff --git a/xmake-requires.lock b/xmake-requires.lock
@@ -1,6 +1,134 @@
 {
-    __meta__ = {
-        version = "1.0"
+    ["linux|x86_64"] = {
+        ["apt::libjpeg62-turbo-dev#31fecfc4"] = {
+            version = "latest"
+        },
+        ["apt::libpng-dev#31fecfc4"] = {
+            version = "latest"
+        },
+        ["cmake#31fecfc4"] = {
+            repo = {
+                branch = "master",
+                commit = "22223c3e860144e789c3c986e064369d66f37573",
+                url = "https://github.com/tboox/xmake-repo.git"
+            },
+            version = "3.26.4"
+        },
+        ["cpr#31fecfc4"] = {
+            repo = {
+                branch = "master",
+                commit = "22223c3e860144e789c3c986e064369d66f37573",
+                url = "https://github.com/tboox/xmake-repo.git"
+            },
+            version = "1.10.5"
+        },
+        ["freetype#31fecfc4"] = {
+            repo = {
+                branch = "master",
+                commit = "22223c3e860144e789c3c986e064369d66f37573",
+                url = "https://github.com/tboox/xmake-repo.git"
+            },
+            version = "2.12.1"
+        },
+        ["libaesgm#31fecfc4"] = {
+            repo = {
+                branch = "master",
+                commit = "b0f8a0654cdf3672eb65e050768bfbfb64b24210",
+                url = "https://github.com/tboox/xmake-repo.git"
+            },
+            version = "2013.1.1"
+        },
+        ["libcurl#31fecfc4"] = {
+            repo = {
+                branch = "master",
+                commit = "22223c3e860144e789c3c986e064369d66f37573",
+                url = "https://github.com/tboox/xmake-repo.git"
+            },
+            version = "8.4.0"
+        },
+        ["libgit2 1.7.1#31fecfc4"] = {
+            repo = {
+                branch = "master",
+                commit = "e4a467ab6e25d9afa5324cf536141660a5c1eef4",
+                url = "https://github.com/tboox/xmake-repo.git"
+            },
+            version = "v1.7.1"
+        },
+        ["libjpeg#31fecfc4"] = {
+            repo = {
+                branch = "master",
+                commit = "b0f8a0654cdf3672eb65e050768bfbfb64b24210",
+                url = "https://github.com/tboox/xmake-repo.git"
+            },
+            version = "1.5.2"
+        },
+        ["libpng#31fecfc4"] = {
+            repo = {
+                branch = "master",
+                commit = "e4a467ab6e25d9afa5324cf536141660a5c1eef4",
+                url = "https://github.com/tboox/xmake-repo.git"
+            },
+            version = "1.6.36"
+        },
+        ["lolly#31fecfc4"] = {
+            version = "v1.3.13"
+        },
+        ["openssl#31fecfc4"] = {
+            repo = {
+                branch = "master",
+                commit = "e4a467ab6e25d9afa5324cf536141660a5c1eef4",
+                url = "https://github.com/tboox/xmake-repo.git"
+            },
+            version = "1.1.1d"
+        },
+        ["pcre#31fecfc4"] = {
+            repo = {
+                branch = "master",
+                commit = "e4a467ab6e25d9afa5324cf536141660a5c1eef4",
+                url = "https://github.com/tboox/xmake-repo.git"
+            },
+            version = "8.45"
+        },
+        ["pdfhummus 4.6.2#23149c54"] = {
+            repo = {
+                branch = "master",
+                commit = "e4a467ab6e25d9afa5324cf536141660a5c1eef4",
+                url = "https://github.com/tboox/xmake-repo.git"
+            },
+            version = "v4.6.2"
+        },
+        ["pkg-config#31fecfc4"] = {
+            repo = {
+                branch = "master",
+                commit = "e4a467ab6e25d9afa5324cf536141660a5c1eef4",
+                url = "https://github.com/tboox/xmake-repo.git"
+            },
+            version = "0.29"
+        },
+        ["s7 2023.04.13#31fecfc4"] = {
+            repo = {
+                branch = "master",
+                commit = "b0f8a0654cdf3672eb65e050768bfbfb64b24210",
+                url = "https://github.com/tboox/xmake-repo.git"
+            },
+            version = "2023.04.13"
+        },
+        ["tbox#31fecfc4"] = {
+            repo = {
+                branch = "master",
+                commit = "22223c3e860144e789c3c986e064369d66f37573",
+                url = "https://github.com/tboox/xmake-repo.git"
+            },
+            version = "v1.7.5"
+        },
+        ["zlib#31fecfc4"] = {
+            repo = {
+                branch = "master",
+                commit = "e4a467ab6e25d9afa5324cf536141660a5c1eef4",
+                url = "https://github.com/tboox/xmake-repo.git"
+            },
+            version = "1.2.11"
+        }
     },
     ["macosx|arm64"] = {
         ["cmake#31fecfc4"] = {
@@ -111,6 +239,9 @@
             version = "1.2.11"
         }
     },
+    __meta__ = {
+        version = "1.0"
+    },
     ["windows|x64"] = {
         ["aqt#31fecfc4"] = {
             repo = {
@@ -292,4 +423,4 @@
             version = "v1.3"
         }
     }
-}
+}
diff --git a/xmake/packages.lua b/xmake/packages.lua
@@ -28,6 +28,7 @@ local LIBPNG_VERSION = "1.6.37"
 local LIBJPEG_VERSION = "v9e"
 local LIBICONV_VERSION = "1.17"
 local LIBGIT2_VERSION = "1.7.1"
+local CMAKE_VERSION = "3.26.4"
 
 -- https://xmake.io/#/manual/package_dependencies?id=inherit-package-configuration
 package("lolly")
@@ -146,5 +147,6 @@ function add_requires_of_mogan()
     set_configvar("LIBGIT2_VERSION", LIBGIT2_VERSION)
     if not is_plat("wasm") then
         add_requires("libgit2 "..LIBGIT2_VERSION, {system=false})
+        add_requireconfs("libgit2.cmake", {version = CMAKE_VERSION, system = false, override=true})
     end
 end