Skip to content

Commit

Permalink
Merge branch 'release/0.2.0'
Browse files Browse the repository at this point in the history
* release/0.2.0:
  (travis build) Changed minimum mono version to official recommended version
  (travis build) Changed dotnet to only target 1.0.1
  Skip appveyor build when on ci/travis branch
  Testing different configuration on travis
  Changed GCI -Name to GCI -Filter
  Expanding FullName when resolving coverage file
  Updated cake build and build dependencies
  Fixed resolving coverage report file
  Add additional modes when pulling down resources.
  • Loading branch information
AdmiringWorm committed May 17, 2017
2 parents ac57e50 + 5eea514 commit 6e304a6
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 16 deletions.
6 changes: 4 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
version: '{build}'
pull_requests:
do_not_increment_build_number: true
skip_branch_with_pr: true
branches:
except:
- ci/travis
image: Visual Studio 2017
environment:
MYGET_API_KEY:
Expand All @@ -25,4 +27,4 @@ artifacts:
- path: artifacts\**\*.nupkg
deploy: off
on_success:
- ps: codecov -X gcov --required --file $(Get-ChildItem "./artifacts" -Name "coverage-result.xml" -File | select -First 1)
- ps: codecov -X gcov --required --file $(Get-ChildItem "./artifacts" -Filter "coverage-result.xml" -File -Recurse | select -Last 1 -expand FullName)
2 changes: 1 addition & 1 deletion .build/tools.cake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#tool "nuget:?package=gitreleasemanager&version=0.6.0"
#tool "nuget:?package=GitVersion.CommandLine&version=3.6.5"
#tool "nuget:?package=OpenCover&version=4.6.519"
#tool "nuget:?package=ReportGenerator&version=2.5.5"
#tool "nuget:?package=ReportGenerator&version=2.5.8"
21 changes: 10 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,16 @@ env:
global:
- CONFIGURATION=Release

matrix:
include:
- os: osx
osx_image: xcode7.3
dotnet: 1.0.1
mono: 4.0.5
- os: linux
dist: trusty
sudo: required
dotnet: 1.0.1
mono: 4.0.5
os:
- osx
- linux
osx_image: xcode7.3
dist: trusty
sudo: required
mono:
- 4.2.3
- latest
dotnet: 1.0.1

branches:
except:
Expand Down
24 changes: 23 additions & 1 deletion src/Cake.Transifex/TransifexMode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,38 @@ public enum TransifexMode
/// <summary>
/// Only pull down reviewed translations.
/// </summary>
/// <remarks>
/// All translations that have not been reviewed will either be empty, or be in the source
/// language (depending on the file format used)
/// </remarks>
Reviewed,

/// <summary>
/// Pull down all translations, whether they have been translated or not.
/// </summary>
/// <remarks>These are files suitable for usage by developers in their source code tree.</remarks>
Developer,

/// <summary>
/// Pull down all completed translations, whether they have been reviewed or not.
/// </summary>
Translator
/// <remarks>These are files suitable for offline translation of the resource(s).</remarks>
Translator,

/// <summary>
/// Pull down only strings that have been translated.
/// </summary>
OnlyTranslated,

/// <summary>
/// Pull down only strings that have been translated and reviewed.
/// </summary>
OnlyReviewed,

/// <summary>
/// Pull down both translated and untranslated strings (untranslated strings will be set to
/// the value of the source).
/// </summary>
SourceAsTranslation
}
}
3 changes: 3 additions & 0 deletions tests/Cake.Transifex.Tests/TransifexPullRunnerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ public void Evaluate_SetsMinimumPercWhenNotNull()
[InlineData(TransifexMode.Developer)]
[InlineData(TransifexMode.Reviewed)]
[InlineData(TransifexMode.Translator)]
[InlineData(TransifexMode.OnlyTranslated)]
[InlineData(TransifexMode.OnlyReviewed)]
[InlineData(TransifexMode.SourceAsTranslation)]
public void Evaluate_SetsModeWhenNotNull(TransifexMode mode)
{
var expected = mode.ToString().ToLowerInvariant();
Expand Down
2 changes: 1 addition & 1 deletion tools/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Cake" version="0.18.0" />
<package id="Cake" version="0.19.5" />
</packages>

0 comments on commit 6e304a6

Please sign in to comment.