Skip to content

Commit

Permalink
Merge pull request #162 from GridProtectionAlliance/UpdateForJenkinsB…
Browse files Browse the repository at this point in the history
…uild

Added Targets for PR logic
  • Loading branch information
StephenCWills committed Jun 5, 2024
2 parents fbe1950 + 746ffe6 commit c3067ca
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
3 changes: 3 additions & 0 deletions Build/Scripts/Synchrophasor.buildproj
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,7 @@
<MakeDir Directories="$(HelpDeployFolder)" Condition="!Exists('$(HelpDeployFolder)')"/>
<Copy SourceFiles="@(HelpFilesToDeploy)" DestinationFolder="$(HelpDeployFolder)\%(HelpFilesToDeploy.RecursiveDir)"/>
</Target>
<Target Name="AfterPushToServer" Condition="'$(DoNotPush)' == 'false' And '$(SkipVersioning)' != 'true'">
<Exec Command="%22$(AfterPushScript)%22 openPDC $(BuildTag)" Condition="'$(PushToVersionBranch)' == 'true' And Exists('$(AfterPushScript)')" />
</Target>
</Project>
10 changes: 9 additions & 1 deletion Build/Scripts/UpdateDependencies.bat
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
::*******************************************************************************************************
:: UpdateDependencies.bat - Gbtc
::
:: Copyright © 2013, Grid Protection Alliance. All Rights Reserved.
:: Copyright (c) 2013, Grid Protection Alliance. All Rights Reserved.
::
:: Licensed to the Grid Protection Alliance (GPA) under one or more contributor license agreements. See
:: the NOTICE file distributed with this work for additional information regarding copyright ownership.
Expand Down Expand Up @@ -165,8 +165,16 @@ IF NOT "%donotpush%" == "" GOTO Finish
ECHO.
ECHO Pushing changes to remote repository...
"%git%" push
FOR /F "tokens=* USEBACKQ" %%F IN (`"%git%" describe --tags --abbrev^=0`) DO SET version=%%F
SET remotebranch=master
IF "%pushtoversionbranch%" == "true" SET remotebranch=ud-%version%
"%git%" push origin HEAD:%remotebranch%

:AfterPushChanges
CD /D %pwd%
IF EXIST "%afterpushscript%" CALL "%afterpushscript%" openPDC %remotebranch%

:Finish
CD /D %pwd%
ECHO.
ECHO Update complete

0 comments on commit c3067ca

Please sign in to comment.