CI: update to 4.3.0-rc1

pkdawson · Jul 26, 2024 · e7108a3 · e7108a3
1 parent af136fe
commit e7108a3
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/gdext.yml b/.github/workflows/gdext.yml
@@ -286,7 +286,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-14, windows-latest]
-        gdver: ["4.2.2", "4.3.0-beta.3"]
+        gdver: ["4.2.2", "4.3.0-rc.1"]
         include:
           - os: ubuntu-latest
             name: 🐧GdsGameProject
@@ -367,7 +367,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-14, windows-latest]
-        gdver: ["4.2.2", "4.3.0-beta.3"]
+        gdver: ["4.2.2", "4.3.0-rc.1"]
         include:
           - os: ubuntu-latest
             name: 🐧🧪GDScript
@@ -415,7 +415,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-14, windows-latest]
-        gdver: ["4.2.2", "4.3.0-beta.3"]
+        gdver: ["4.2.2", "4.3.0-rc.1"]
         include:
           - os: ubuntu-latest
             name: 🐧🧪C#

diff --git a/.github/workflows/godot.yml b/.github/workflows/godot.yml
@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-14, windows-latest]
-        gdver: ["4.2.2", "4.3.0-beta.3"]
+        gdver: ["4.2.2", "4.3.0-rc.1"]
         include:
           - os: ubuntu-latest
             name: 🐧🧪C# Only

diff --git a/Dear ImGui for Godot Demo.csproj b/Dear ImGui for Godot Demo.csproj
@@ -8,7 +8,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="doc\**" />
+    <Compile Remove="gdext\**" />
     <EmbeddedResource Remove="doc\**" />
+    <EmbeddedResource Remove="gdext\**" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ImGui.NET" Version="1.90.9.1" />

diff --git a/gdext/SConstruct b/gdext/SConstruct
@@ -33,9 +33,12 @@ if config == "release":
         env.Append(CPPDEFINES=["NDEBUG"])
 
 if windows:
-    triplet = "x64-windows-static"
-    if not os.path.exists("vcpkg_installed"):
-        subprocess.call(f"%VCPKG_ROOT%/vcpkg install --triplet {triplet}", shell=True)
+    if env["arch"] == "arm64":
+        triplet = "arm64-windows-static"
+    else:
+        triplet = "x64-windows-static"
+    if not os.path.exists(f"vcpkg_installed/{triplet}"):
+        subprocess.call(f'"%VCPKG_ROOT%/vcpkg" install --triplet {triplet}', shell=True)
 elif linux:
     triplet = "x64-linux"
     if not os.path.exists("vcpkg_installed"):

diff --git a/gdext/godot-cpp b/gdext/godot-cpp
diff --git a/gdext/vcpkg.json b/gdext/vcpkg.json
@@ -1,5 +1,6 @@
 {
     "dependencies": [
         "freetype"
-    ]
+    ],
+    "builtin-baseline": "1de2026f28ead93ff1773e6e680387643e914ea1"
 }
+16 −0		.editorconfig
+2 −6		.gitattributes
+2 −2		.github/workflows/ci.yml
+21 −42		.github/workflows/static_checks.yml
+1 −1		.gitignore
+64 −0		.pre-commit-config.yaml
+1 −1		CMakeLists.txt
+2 −7		SConstruct
+176 −60		binding_generator.py
+1 −1		include/godot_cpp/core/method_bind.hpp
+4 −4		include/godot_cpp/templates/local_vector.hpp
+5 −0		include/godot_cpp/variant/array_helpers.hpp
+5 −0		include/godot_cpp/variant/color_names.inc.hpp
+1 −1		include/godot_cpp/variant/rect2.hpp
+1 −1		include/godot_cpp/variant/rect2i.hpp
+16 −6		include/godot_cpp/variant/typed_array.hpp
+0 −37		misc/hooks/README.md
+0 −48		misc/hooks/canonicalize_filename.sh
+0 −50		misc/hooks/pre-commit
+0 −202		misc/hooks/pre-commit-black
+0 −242		misc/hooks/pre-commit-clang-format
+0 −103		misc/hooks/winmessage.ps1
+0 −25		misc/scripts/black_format.sh
+4 −2		misc/scripts/check_ci_log.py
+3 −3		misc/scripts/check_get_file_list.py
+0 −38		misc/scripts/clang_format.sh
+0 −5		misc/scripts/codespell.sh
+50 −49		misc/scripts/copyright_headers.py
+46 −0		misc/scripts/file_format.py
+0 −41		misc/scripts/file_format.sh
+127 −0		misc/scripts/header_guards.py
+0 −60		misc/scripts/header_guards.sh
+0 −11		misc/scripts/mypy.ini
+0 −6		misc/scripts/mypy_check.sh
+58 −0		pyproject.toml
+3 −3		src/core/memory.cpp
+1 −1		src/variant/basis.cpp
+1 −1		src/variant/color.cpp
+0 −2		test/SConstruct
+9 −0		test/build_profile.json
+2 −2		test/project/main.gd
+4 −4		test/src/example.cpp
+1 −1		test/src/example.h
+19 −18		test/src/tests.h
+2 −2		tools/android.py
+0 −1		tools/common_compiler_flags.py
+16 −6		tools/godotcpp.py
+3 −2		tools/ios.py
+1 −1		tools/linux.py
+1 −0		tools/macos.py
+0 −1		tools/my_spawn.py
+0 −1		tools/web.py
+73 −4		tools/windows.py