-
-
Notifications
You must be signed in to change notification settings - Fork 167
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
2b3ef55
commit 7c234f6
Showing
1 changed file
with
4 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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'); | ||
|