Merge branch 'dev' into on_success

.cspell.json

@@ -133,7 +133,9 @@
 		"cvtps",
 		"neww",
 		"STDCORO",
-		"NOMINMAX"
+		"NOMINMAX",
+		"sku",
+		"skus"
 	],
 	"flagWords": [
 		"hte"

buildtools/classes/Packager/Vcpkg.php

@@ -250,6 +250,8 @@ function secondBuild(string $portFileContent): bool
         chdir('/usr/local/share/vcpkg');
         $this->sudo('./vcpkg format-manifest ./ports/dpp/vcpkg.json');
         /* Note: We commit this in /usr/local, but we never push it (we can't) */
+        $this->git('config --global user.email "[email protected]"');
+        $this->git('config --global user.name "DPP VCPKG Bot"');
         $this->git('add .', true);
         $this->git('commit -m "[bot] VCPKG info update"', true);
         $this->sudo('/usr/local/share/vcpkg/vcpkg x-add-version dpp');
@@ -261,6 +263,8 @@ function secondBuild(string $portFileContent): bool
         system('cp -v -R /usr/local/share/vcpkg/versions/d-/dpp.json ./vcpkg/versions/d-/dpp.json');
 
         echo GREEN . "Commit and push changes to master branch\n" . WHITE;
+        $this->git('config --global user.email "[email protected]"');
+        $this->git('config --global user.name "DPP VCPKG Bot"');
         $this->git('add .');
         $this->git('commit -m "[bot] VCPKG info update [skip ci]"');
         $this->git('config pull.rebase false');