From 7c234f6b539ed3dd1913ec11a3550d4b261cae85 Mon Sep 17 00:00:00 2001 From: Craig Edwards Date: Fri, 27 Oct 2023 19:02:30 +0000 Subject: [PATCH] ci: vcpkg fix --- buildtools/classes/Packager/Vcpkg.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/buildtools/classes/Packager/Vcpkg.php b/buildtools/classes/Packager/Vcpkg.php index 3b3bee9d12..c1a4943419 100644 --- a/buildtools/classes/Packager/Vcpkg.php +++ b/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 "noreply@dpp.dev"'); + $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 "noreply@dpp.dev"'); + $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');