Преглед изворни кода

update imgui v1.91.9 & promote `windows-2019` worker to `windows-2025` (#7286)

* update luau 0.676 & promote `windows-2019` worker to `windows-2025`

* update imgui instead
Saikari пре 4 месеци
родитељ
комит
254154326b
2 измењених фајлова са 4 додато и 6 уклоњено
  1. 2 6
      .github/workflows/windows.yml
  2. 2 0
      packages/i/imgui/xmake.lua

+ 2 - 6
.github/workflows/windows.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
     strategy:
       fail-fast: false
       fail-fast: false
       matrix:
       matrix:
-        os: [windows-2019, windows-2022]
+        os: [windows-2022, windows-2025]
         kind: [static, shared]
         kind: [static, shared]
         arch: [x64, x86, arm64]
         arch: [x64, x86, arm64]
         runtimes: [MT, MD]
         runtimes: [MT, MD]
@@ -38,9 +38,5 @@ jobs:
       - name: Tests
       - name: Tests
         run: |
         run: |
           xmake --version
           xmake --version
-          if ("${{ matrix.os }}" -eq "windows-2019") {
-            xmake l ./scripts/test.lua -vD -a ${{ matrix.arch }} -k ${{ matrix.kind }} --runtimes=${{ matrix.runtimes }} --vs_sdkver=10.0.19041.0 --linkjobs=2
-          } else {
-            xmake l ./scripts/test.lua -vD -a ${{ matrix.arch }} -k ${{ matrix.kind }} --runtimes=${{ matrix.runtimes }} --linkjobs=2
-          }
+          xmake l ./scripts/test.lua -vD -a ${{ matrix.arch }} -k ${{ matrix.kind }} --runtimes=${{ matrix.runtimes }} --linkjobs=2
 
 

+ 2 - 0
packages/i/imgui/xmake.lua

@@ -7,6 +7,7 @@ package("imgui")
     add_urls("https://github.com/ocornut/imgui.git", {alias = "git"})
     add_urls("https://github.com/ocornut/imgui.git", {alias = "git"})
 
 
     -- don't forget to add the docking versions as well
     -- don't forget to add the docking versions as well
+    add_versions("v1.91.9", "3872a5f90df78fced023c1945f4466b654fd74573370b77b17742149763a7a7c")
     add_versions("v1.91.8", "db3a2e02bfd6c269adf0968950573053d002f40bdfb9ef2e4a90bce804b0f286")
     add_versions("v1.91.8", "db3a2e02bfd6c269adf0968950573053d002f40bdfb9ef2e4a90bce804b0f286")
     add_versions("v1.91.7", "2001dab4bdd7d178d8277d3b17c40aa1ff1e76e2ccac5e7ab8c6daf9756312c2")
     add_versions("v1.91.7", "2001dab4bdd7d178d8277d3b17c40aa1ff1e76e2ccac5e7ab8c6daf9756312c2")
     add_versions("v1.91.6", "c5fbc5dcab1d46064001c3b84d7a88812985cde7e0e9ced03f5677bec1ba502a")
     add_versions("v1.91.6", "c5fbc5dcab1d46064001c3b84d7a88812985cde7e0e9ced03f5677bec1ba502a")
@@ -50,6 +51,7 @@ package("imgui")
     add_versions("v1.76",   "e482dda81330d38c87bd81597cacaa89f05e20ed2c4c4a93a64322e97565f6dc")
     add_versions("v1.76",   "e482dda81330d38c87bd81597cacaa89f05e20ed2c4c4a93a64322e97565f6dc")
     add_versions("v1.75",   "1023227fae4cf9c8032f56afcaea8902e9bfaad6d9094d6e48fb8f3903c7b866")
     add_versions("v1.75",   "1023227fae4cf9c8032f56afcaea8902e9bfaad6d9094d6e48fb8f3903c7b866")
 
 
+    add_versions("git:v1.91.9-docking", "v1.91.9-docking")
     add_versions("git:v1.91.8-docking", "v1.91.8-docking")
     add_versions("git:v1.91.8-docking", "v1.91.8-docking")
     add_versions("git:v1.91.7-docking", "v1.91.7-docking")
     add_versions("git:v1.91.7-docking", "v1.91.7-docking")
     add_versions("git:v1.91.6-docking", "v1.91.6-docking")
     add_versions("git:v1.91.6-docking", "v1.91.6-docking")