[1.2.8] xmake: re-lock on macOS arm and Windows

XmacsLabs · Aug 3, 2024 · 872e143 · 872e143
1 parent c2a34e7
commit 872e143
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 27 deletions.
diff --git a/.github/workflows/cd_research_on_windows.yml b/.github/workflows/cd_research_on_windows.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: xmake-io/github-action-setup-xmake@v1
         with:
-          xmake-version: v2.8.7
+          xmake-version: v2.9.3
       - name: update repo
         run: |
           xrepo update-repo

diff --git a/.github/workflows/ci-xmake-windows.yml b/.github/workflows/ci-xmake-windows.yml
@@ -43,7 +43,7 @@ jobs:
     steps:
       - uses: xmake-io/github-action-setup-xmake@v1
         with:
-          xmake-version: v2.8.9
+          xmake-version: v2.9.3
       - name: update repo
         run: |
           xrepo update-repo

diff --git a/xmake-requires.lock b/xmake-requires.lock
@@ -6,7 +6,7 @@
         ["cmake#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "7449d9dbda1e5dadfe88301c8516c4e25527ada7",
+                commit = "8ae62d92005d3fee84b3477fc06183d33ef36584",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "3.26.4"
@@ -26,15 +26,15 @@
         ["libaesgm#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "15ad332bc1573ceda1afb06fd8696c31c5e09f36",
+                commit = "8ae62d92005d3fee84b3477fc06183d33ef36584",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "2013.1.1"
         },
         ["libcurl#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "15ad332bc1573ceda1afb06fd8696c31c5e09f36",
+                commit = "8ae62d92005d3fee84b3477fc06183d33ef36584",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "8.4.0"
@@ -48,15 +48,15 @@
         ["libjpeg#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "15ad332bc1573ceda1afb06fd8696c31c5e09f36",
+                commit = "8ae62d92005d3fee84b3477fc06183d33ef36584",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "v9e"
         },
         ["libpng#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "15ad332bc1573ceda1afb06fd8696c31c5e09f36",
+                commit = "8ae62d92005d3fee84b3477fc06183d33ef36584",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "v1.6.37"
@@ -65,7 +65,7 @@
             repo = {
                 url = "xmake"
             },
-            version = "1.4.21"
+            version = "1.4.26"
         },
         ["mimalloc#31fecfc4"] = {
             repo = {
@@ -77,24 +77,24 @@
             repo = {
                 url = "xmake"
             },
-            version = "0.1.18"
+            version = "0.1.21"
         },
         ["pdfhummus 4.6.2#23149c54"] = {
             repo = {
                 url = "xmake"
             },
             version = "4.6.2"
         },
-        ["s7 20230413#31fecfc4"] = {
+        ["s7 20240702#31fecfc4"] = {
             repo = {
                 url = "xmake"
             },
-            version = "20230413"
+            version = "20240702"
         },
         ["tbox#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "15ad332bc1573ceda1afb06fd8696c31c5e09f36",
+                commit = "8ae62d92005d3fee84b3477fc06183d33ef36584",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "v1.7.5"
@@ -110,15 +110,15 @@
         ["aqt#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "3ed70159b1c327b0f2ddddd18fc9b9213520648c",
+                commit = "28eecb681952892a51f0c1520daba3c027f70d16",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "3.1.6"
         },
         ["cmake#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "3ed70159b1c327b0f2ddddd18fc9b9213520648c",
+                commit = "28eecb681952892a51f0c1520daba3c027f70d16",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "3.27.3"
@@ -147,7 +147,7 @@
         ["libcurl#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "3ed70159b1c327b0f2ddddd18fc9b9213520648c",
+                commit = "28eecb681952892a51f0c1520daba3c027f70d16",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "8.4.0"
@@ -186,7 +186,7 @@
             repo = {
                 url = "xmake"
             },
-            version = "1.4.21"
+            version = "1.4.26"
         },
         ["mimalloc#31fecfc4"] = {
             repo = {
@@ -198,7 +198,7 @@
             repo = {
                 url = "xmake"
             },
-            version = "0.1.18"
+            version = "0.1.21"
         },
         ["openssl#31fecfc4"] = {
             repo = {
@@ -217,48 +217,48 @@
         ["pkgconf#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "3ed70159b1c327b0f2ddddd18fc9b9213520648c",
+                commit = "28eecb681952892a51f0c1520daba3c027f70d16",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "2.0.3"
         },
         ["qt6base#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "3ed70159b1c327b0f2ddddd18fc9b9213520648c",
+                commit = "28eecb681952892a51f0c1520daba3c027f70d16",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "6.5.3"
         },
         ["qt6core#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "3ed70159b1c327b0f2ddddd18fc9b9213520648c",
+                commit = "28eecb681952892a51f0c1520daba3c027f70d16",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "6.5.3"
         },
         ["qt6gui#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "3ed70159b1c327b0f2ddddd18fc9b9213520648c",
+                commit = "28eecb681952892a51f0c1520daba3c027f70d16",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "6.5.3"
         },
         ["qt6widgets 6.5.3#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "3ed70159b1c327b0f2ddddd18fc9b9213520648c",
+                commit = "28eecb681952892a51f0c1520daba3c027f70d16",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "6.5.3"
         },
-        ["s7 20230413#31fecfc4"] = {
+        ["s7 20240702#31fecfc4"] = {
             repo = {
                 url = "xmake"
             },
-            version = "20230413"
+            version = "20240702"
         },
         ["tbox#31fecfc4"] = {
             repo = {

diff --git a/xmake.lua b/xmake.lua
@@ -76,9 +76,9 @@ option("use-exceptions")
 option_end()
 
 -- only lock it in rc releases
--- if is_plat ("macosx", "windows") then
---     set_policy("package.requires_lock", true)
--- end
+if is_plat ("macosx", "windows") then
+    set_policy("package.requires_lock", true)
+end
 add_repositories("mogan-repo xmake")
 add_requires_of_mogan()