Skip to content

Commit

Permalink
Fix TeamCity Downloads
Browse files Browse the repository at this point in the history 
* Specify tags for each build type.
* Remove lingering references to Icu4c from TC (now using Nuget)

TeamCity has changed or removed its API for retrieving available
tags, and we had already been falling through to .lastSuccessful
in both instances that were still querying this API.

Change-Id: Ib143b0241d5992cd783bd05a99546770474aa7a2
(cherry picked from commit 1a8ee2a)
  • Loading branch information
@papeh
papeh committed Jul 25, 2023
1 parent 97dba2c commit b9ec436
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 16 deletions.
9 changes: 0 additions & 9 deletions Build/LocalLibrary.targets
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
<PropertyGroup>
<Icu4cBuildType Condition="'$(OS)'=='Windows_NT' AND '$(Platform)'!='x64'">Libraries_Icu4cWin32FieldWorksContinuous</Icu4cBuildType>
<Icu4cBuildType Condition="'$(OS)'=='Windows_NT' AND '$(Platform)'=='x64'">Libraries_Icu4cWin64FieldWorksContinuous</Icu4cBuildType>
<TeamCityUrl>https://build.palaso.org/</TeamCityUrl>
<LiblcmPlatform Condition="'$(OS)'=='Windows_NT' AND '$(Platform)'!='x64'">x86</LiblcmPlatform>
<LiblcmPlatform Condition="'$(OS)'=='Windows_NT' AND '$(Platform)'=='x64'">x64</LiblcmPlatform>
<LiblcmPlatform Condition="'$(OS)'!='Windows_NT'">x86</LiblcmPlatform>
Expand All @@ -24,11 +21,6 @@
<PalasoFileNamesForLL Include="SIL.TestUtilities.dll" />
<PalasoFileNamesForLL Include="Newtonsoft.Json.dll" />
<PalasoFileNamesForLL Include="Spart.dll" />
<IcuFileNamesForLL Include="gennorm2.exe" />
<IcuFileNamesForLL Include="icudt54.dll" />
<IcuFileNamesForLL Include="icuin54.dll" />
<IcuFileNamesForLL Include="icutu54.dll" />
<IcuFileNamesForLL Include="icuuc54.dll" />
<!--The Chorus Library uses these-->
<ChorusDeps Include="SIL.Windows.Forms.dll" />
<ChorusDeps Include="SIL.Windows.Forms.pdb" />
Expand All @@ -49,7 +41,6 @@
<!--Build the LCM library-->
<MakeDir Directories="$(LcmArtifactsDir)" />
<MakeDir Directories="$(LcmArtifactsDir)/../../lib/downloads/$(Platform)" Condition="'$(OS)'=='Windows_NT' "/>
<DownloadFilesFromTeamCity Address="$(TeamCityUrl)" BuildType="$(Icu4cBuildType)" Artifacts="@(IcuFileNamesForLL)" DownloadsDir="$(LcmArtifactsDir)/../../lib/downloads/$(Platform)" Condition="'$(OS)'=='Windows_NT'"/>
<Copy SourceFiles="@(PalasoFileNamesForLL -> '$(PalasoArtifactsDir)/%(Identity)')" DestinationFolder="$(LcmArtifactsDir)/../../lib/downloads" />
<Message Text="Building liblcm. Artifacts will be put into: $(LcmArtifactsDir)" />
<MSBuild Projects="$(LcmArtifactsDir)/../../LCM.sln"
Expand Down
13 changes: 6 additions & 7 deletions Build/mkall.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,8 @@
<ExCss Condition="'$(OS)'=='Unix'">ExCSS</ExCss>
<ExCssBuildTag>fw-9.0.11.tcbuildtag</ExCssBuildTag>
<Icu4cBuildType32>Libraries_Icu4cWin32FieldWorksContinuous</Icu4cBuildType32>
<Icu4cBuildTag32>fw-9.0.11.tcbuildtag</Icu4cBuildTag32>
<Icu4cBuildType64>Libraries_Icu4cWin64FieldWorksContinuous</Icu4cBuildType64>
<Icu4cBuildTag64>fw-9.0.11.tcbuildtag</Icu4cBuildTag64>
<Icu4cBuildTag>fw-9.0.11.tcbuildtag</Icu4cBuildTag>
<HermitCrabBuildType>bt410</HermitCrabBuildType>
<HermitCrabBuildTag>fw-9.0.tcbuildtag</HermitCrabBuildTag>
<NUnitDownloadUrl>https://github.com/nunit/nunitv2/releases/download/2.6.4/NUnit-2.6.4.zip</NUnitDownloadUrl>
Expand Down Expand Up @@ -446,16 +445,16 @@
<MakeDir Directories="$(DownloadsDir)/lib/x86"/>
<Message Text="NOT" Condition="'$(UseLocalLibraries)'=='Y'"/>
<Message Text="Downloading artifacts for Palaso, including L10NSharp, Enchant.Net, ibusdotnet, NDesk.DBus, Spart, and Newtonsoft.Json."/>
<DownloadFilesFromTeamCity Address="$(TeamCityUrl)" BuildType="$(PalasoBuildType)" VersionInfo="$(MasterVersionInfo)"
<DownloadFilesFromTeamCity Address="$(TeamCityUrl)" BuildType="$(PalasoBuildType)"
Artifacts="@(PalasoFiles)" DownloadsDir="$(DownloadsDir)" Tag="$(PalasoBuildTag)" Condition="'$(UseLocalLibraries)'!='Y'"/>

<Message Text="Downloading artifacts for Chorus."/>
<DownloadFilesFromTeamCity Address="$(TeamCityUrl)" BuildType="$(ChorusBuildType)" VersionInfo="$(MasterVersionInfo)"
<DownloadFilesFromTeamCity Address="$(TeamCityUrl)" BuildType="$(ChorusBuildType)"
Artifacts="@(ChorusFiles)" DownloadsDir="$(DownloadsDir)" Tag="$(ChorusBuildTag)" Condition="'$(UseLocalLibraries)'!='Y'"/>

<Message Text="nor" Condition="'$(UseLocalLibraries)'=='Y'"/>
<Message Text="Downloading artifacts for LCM." />
<DownloadFilesFromTeamCity Address="$(TeamCityUrl)" BuildType="$(LcmBuildType)" VersionInfo="$(MasterVersionInfo)" Artifacts="LCM.zip" DownloadsDir="$(DownloadsDir)" Condition="'$(UseLocalLibraries)'!='Y'" Tag="$(LcmBuildTag)"/>
<DownloadFilesFromTeamCity Address="$(TeamCityUrl)" BuildType="$(LcmBuildType)" Artifacts="LCM.zip" DownloadsDir="$(DownloadsDir)" Condition="'$(UseLocalLibraries)'!='Y'" Tag="$(LcmBuildTag)"/>
<Message Text="(the above artifacts will be copied from $(PalasoArtifactsDir), $(ChorusArtifactsDir), and $(LcmArtifactsDir), respectively, as specified in LibraryDevelopment.targets)" Condition="'$(UseLocalLibraries)'=='Y'"/>

<Message Text="Downloading an artifact for IPCFramework."/>
Expand All @@ -466,8 +465,8 @@
<DownloadFilesFromTeamCity Address="$(TeamCityUrl)" BuildType="$(ExCssBuildType)" Tag="$(ExCssBuildTag)" Artifacts="$(ExCss).dll;$(ExCss).$(DebugInfo)" DownloadsDir="$(DownloadsDir)"/>

<Message Text="Downloading artifacts for icu4c." Condition="'$(OS)'=='Windows_NT'"/>
<DownloadFilesFromTeamCity Address="$(TeamCityUrl)" BuildType="$(Icu4cBuildType32)" Tag="$(Icu4cBuildTag32)" Artifacts="@(IcuFiles)" DownloadsDir="$(DownloadsDir)/lib/x86" Condition="'$(OS)'=='Windows_NT'"/>
<DownloadFilesFromTeamCity Address="$(TeamCityUrl)" BuildType="$(Icu4cBuildType64)" Tag="$(Icu4cBuildTag64)" Artifacts="@(IcuFiles)" DownloadsDir="$(DownloadsDir)/lib/x64" Condition="'$(OS)'=='Windows_NT' AND '$(arch)'=='x64'"/>
<DownloadFilesFromTeamCity Address="$(TeamCityUrl)" BuildType="$(Icu4cBuildType32)" Tag="$(Icu4cBuildTag)" Artifacts="@(IcuFiles)" DownloadsDir="$(DownloadsDir)/lib/x86" Condition="'$(OS)'=='Windows_NT'"/>
<DownloadFilesFromTeamCity Address="$(TeamCityUrl)" BuildType="$(Icu4cBuildType64)" Tag="$(Icu4cBuildTag)" Artifacts="@(IcuFiles)" DownloadsDir="$(DownloadsDir)/lib/x64" Condition="'$(OS)'=='Windows_NT' AND '$(arch)'=='x64'"/>

<Message Text="Downloading artifacts for HermitCrab." />
<DownloadFilesFromTeamCity Address="$(TeamCityUrl)" BuildType="$(HermitCrabBuildType)" Tag="$(HermitCrabBuildTag)" Artifacts="QuickGraph.dll;SIL.Machine.dll;SIL.Collections.dll;SIL.HermitCrab.dll" DownloadsDir="$(DownloadsDir)"/>
Expand Down

0 comments on commit b9ec436

Please sign in to comment.