Skip to content

Commit

Permalink
bugfix: resolved issues with continuous integration pipeline
Browse files Browse the repository at this point in the history
1) bugfix: removed windows phone silverlight from nuspec
This should have been removed in a previous commit but was missed.

2) bugfix: resolved nuget packaging defect where `reactiveui` meta package was packaging up 108mb of build artifacts.

These artifacts aren't used and should never have been distributed. As it turns out NuGet v3 needs at-least one <file/> include otherwise this happens. Was 108mb now 2.7kb.

3) refactor: changed all android projects to compile with latest SDK (always) and Android SDK installation is now handled via `appveyor.yml` instead of `bootstrap.ps1` as AppVeyor does not currently have build-tools 24 installed in their base image.

4) bugfix: resolved ci problem where builds were showing as failed when the build was actually successful.
  • Loading branch information
ghuntley committed Oct 25, 2016
1 parent 40680b7 commit 4ffcdaa
Show file tree
Hide file tree
Showing 12 changed files with 67 additions and 39 deletions.
37 changes: 25 additions & 12 deletions appveyor.yml
@@ -1,34 +1,47 @@
version: 1.0.{build} version: 1.0.{build}

branches: branches:
only: only:
- rxui7-master - rxui7-master

environment: environment:
ANDROID_HOME: "C:\\android-sdk-windows"

MYGET_API_KEY: MYGET_API_KEY:
secure: YP/3KxC2ffsuHNaolPXj66JVGzSjON9FcR2S2OEzn9c6SV14oPzUh1ySyeT+G+aA secure: YP/3KxC2ffsuHNaolPXj66JVGzSjON9FcR2S2OEzn9c6SV14oPzUh1ySyeT+G+aA
SONAR_API_KEY: SONAR_API_KEY:
secure: 1WyG/T61dXeEzB33DQE5M7qDMwiJ2tALpRF9jJlK3f6oiv6K+L4gp+q8llYh4951 secure: 1WyG/T61dXeEzB33DQE5M7qDMwiJ2tALpRF9jJlK3f6oiv6K+L4gp+q8llYh4951
install:
- cmd: >-
set JAVA_HOME=C:\Program Files\Java\jdk1.8.0


curl -L https://github.com/SonarSource-VisualStudio/sonar-msbuild-runner/releases/download/2.0/MSBuild.SonarQube.Runner-2.0.zip > MSBuild.SonarQube.Runner.zip
unzip MSBuild.SonarQube.Runner.zip
xamarin: xamarin:
email: ghuntley@ghuntley.com email: ghuntley@ghuntley.com
password: password:
secure: 9PLfbvP3ON+Xk17Yd4rJag== secure: 9PLfbvP3ON+Xk17Yd4rJag==
android: true android: true
ios: true ios: true
build_script:
- ps: >-


./bootstrap.ps1 init:
- cd \
- appveyor DownloadFile http://dl.google.com/android/android-sdk_r24.4.1-windows.zip
- 7z x android-sdk_r24.4.1-windows.zip > nul
- cd "C:\projects\reactiveui"


install:

- echo y | "%ANDROID_HOME%\tools\android.bat" update sdk -u -a -t tools
- echo y | "%ANDROID_HOME%\tools\android.bat" update sdk -u -a -t platform-tools
- echo y | "%ANDROID_HOME%\tools\android.bat" update sdk -u -a -t build-tools-24.0.2
- echo y | "%ANDROID_HOME%\tools\android.bat" update sdk -u -a -t android-24
- echo y | "%ANDROID_HOME%\tools\android.bat" update sdk -u -a -t extra-google-m2repository
- echo y | "%ANDROID_HOME%\tools\android.bat" update sdk -u -a -t extra-android-m2repository

build_script:
- ps: >-
./build.cmd ./build.cmd
test: off test: off

artifacts: artifacts:
- path: '**/bin/*' - path: '**/bin/*'
- path: src/ReactiveUI.Events/Events_*.cs - path: src/ReactiveUI.Events/Events_*.cs
- path: artifacts/* - path: artifacts/*
29 changes: 15 additions & 14 deletions bootstrap.ps1
Expand Up @@ -38,18 +38,19 @@ Function Install-AndroidSDK
Execute-AndroidSDKInstall -sdks $sdks Execute-AndroidSDKInstall -sdks $sdks
} }


Install-AndroidSDK 10 #Install-AndroidSDK 10
Install-AndroidSDK 11 #Install-AndroidSDK 11
Install-AndroidSDK 12 #Install-AndroidSDK 12
Install-AndroidSDK 13 #Install-AndroidSDK 13
Install-AndroidSDK 14 #Install-AndroidSDK 14
Install-AndroidSDK 15 #Install-AndroidSDK 15
Install-AndroidSDK 16 Install-AndroidSDK 16
Install-AndroidSDK 18 #Install-AndroidSDK 18
Install-AndroidSDK 19 #Install-AndroidSDK 19
Install-AndroidSDK 20 #Install-AndroidSDK 20
Install-AndroidSDK 21 #Install-AndroidSDK 21
Install-AndroidSDK 20 #Install-AndroidSDK 20
Install-AndroidSDK 21 #Install-AndroidSDK 21
Install-AndroidSDK 22 #Install-AndroidSDK 22
Install-AndroidSDK 23 #Install-AndroidSDK 23
Install-AndroidSDK 24
14 changes: 12 additions & 2 deletions build.cake
Expand Up @@ -16,6 +16,11 @@
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////


var target = Argument("target", "Default"); var target = Argument("target", "Default");
if (string.IsNullOrWhiteSpace(target))
{
target = "Default";
}

var configuration = Argument("configuration", "Release"); var configuration = Argument("configuration", "Release");


////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -243,7 +248,7 @@ Task("BuildEvents")
}; };
build("ReactiveUI.Events_Android.sln"); build("ReactiveUI.Events_Android.sln");
// build("ReactiveUI.Events_iOS.sln"); build("ReactiveUI.Events_iOS.sln");
build("ReactiveUI.Events_MAC.sln"); build("ReactiveUI.Events_MAC.sln");
build("ReactiveUI.Events_XamForms.sln"); build("ReactiveUI.Events_XamForms.sln");
Expand Down Expand Up @@ -408,9 +413,14 @@ Task("Publish")
// TASK TARGETS // TASK TARGETS
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////


Task("Default")
.IsDependentOn("Publish")
.Does (() =>
{
});


////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// EXECUTION // EXECUTION
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////


RunTarget("Publish"); RunTarget(target);
2 changes: 1 addition & 1 deletion build.cmd
Expand Up @@ -3,6 +3,6 @@ tools\nuget\nuget.exe update -self
tools\nuget\nuget.exe install xunit.runner.console -OutputDirectory tools -ExcludeVersion tools\nuget\nuget.exe install xunit.runner.console -OutputDirectory tools -ExcludeVersion
tools\nuget\nuget.exe install Cake -OutputDirectory tools -ExcludeVersion tools\nuget\nuget.exe install Cake -OutputDirectory tools -ExcludeVersion


tools\Cake\Cake.exe build.cake tools\Cake\Cake.exe build.cake --target=%1


exit /b %errorlevel% exit /b %errorlevel%
Expand Up @@ -14,9 +14,10 @@
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix> <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix> <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AssemblyName>Microsoft.Reactive.Testing</AssemblyName> <AssemblyName>Microsoft.Reactive.Testing</AssemblyName>
<TargetFrameworkVersion>v4.0.3</TargetFrameworkVersion> <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages> <RestorePackages>true</RestorePackages>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
Expand Down
2 changes: 0 additions & 2 deletions src/ReactiveUI-Blend.nuspec
Expand Up @@ -33,8 +33,6 @@
</dependencies> </dependencies>
</metadata> </metadata>
<files> <files>
<!-- Windows Phone Silverlight -->
<file src="bin/Release/WP8/ReactiveUI.Blend.dll" target="lib/WP8/ReactiveUI.Blend.dll" />
<!-- Windows Store 8.1 --> <!-- Windows Store 8.1 -->
<file src="bin/Release/Portable-Win81+WPA81/ReactiveUI.Blend.dll" target="lib/Portable-Win81+WPA81/ReactiveUI.Blend.dll" /> <file src="bin/Release/Portable-Win81+WPA81/ReactiveUI.Blend.dll" target="lib/Portable-Win81+WPA81/ReactiveUI.Blend.dll" />
<!-- Windows Universal --> <!-- Windows Universal -->
Expand Down
Expand Up @@ -13,7 +13,7 @@
<RootNamespace>ReactiveUI.Android.Support</RootNamespace> <RootNamespace>ReactiveUI.Android.Support</RootNamespace>
<AssemblyName>ReactiveUI.AndroidSupport</AssemblyName> <AssemblyName>ReactiveUI.AndroidSupport</AssemblyName>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion> <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages> <RestorePackages>true</RestorePackages>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk> <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
Expand Down
4 changes: 2 additions & 2 deletions src/ReactiveUI.Events/ReactiveUI.Events_Android.csproj
Expand Up @@ -15,7 +15,7 @@
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile> <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk> <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion> <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages> <RestorePackages>true</RestorePackages>
<NuGetPackageImportStamp> <NuGetPackageImportStamp>
Expand Down Expand Up @@ -105,4 +105,4 @@
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" /> <Error Condition="!Exists('packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" />
</Target> </Target>
</Project> </Project>
5 changes: 3 additions & 2 deletions src/ReactiveUI.Testing/ReactiveUI.Testing_Android.csproj
Expand Up @@ -12,9 +12,10 @@
<RootNamespace>ReactiveUI.Testing</RootNamespace> <RootNamespace>ReactiveUI.Testing</RootNamespace>
<AssemblyName>ReactiveUI.Testing</AssemblyName> <AssemblyName>ReactiveUI.Testing</AssemblyName>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkVersion>v4.0.3</TargetFrameworkVersion> <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages> <RestorePackages>true</RestorePackages>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols> <DebugSymbols>True</DebugSymbols>
Expand Down Expand Up @@ -97,4 +98,4 @@
</Target> </Target>
--> -->
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
</Project> </Project>
3 changes: 3 additions & 0 deletions src/ReactiveUI.nuspec
Expand Up @@ -9,4 +9,7 @@
<dependency id="reactiveui-core" version="$version$" /> <dependency id="reactiveui-core" version="$version$" />
</dependencies> </dependencies>
</metadata> </metadata>
<files>
<file src="RELEASENOTES.MD" />
</files>
</package> </package>
5 changes: 3 additions & 2 deletions src/ReactiveUI/ReactiveUI_Android.csproj
Expand Up @@ -12,9 +12,10 @@
<RootNamespace>ReactiveUI</RootNamespace> <RootNamespace>ReactiveUI</RootNamespace>
<AssemblyName>ReactiveUI</AssemblyName> <AssemblyName>ReactiveUI</AssemblyName>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkVersion>v4.0.3</TargetFrameworkVersion> <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages> <RestorePackages>true</RestorePackages>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -159,4 +160,4 @@
</Target> </Target>
--> -->
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
</Project> </Project>
Binary file modified tools/nuget/nuget.exe
Binary file not shown.

0 comments on commit 4ffcdaa

Please sign in to comment.