Skip to content

Commit

Permalink
Merge branch 'master' into document-release
Browse files Browse the repository at this point in the history
  • Loading branch information
gep13 authored Jul 6, 2018
2 parents 813a555 + 06b131e commit 39fc8ac
Show file tree
Hide file tree
Showing 184 changed files with 2,724 additions and 1,430 deletions.
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,10 @@ src/GitVersionTfsTask/*.js
####################
# Cake
####################
/tools
tools/*
!tools/packages.config
/*.zip
GitVersion.CommandLine/*/

releaseArtifacts
releaseArtifacts
/ILMergeTemp
16 changes: 9 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
language: csharp
sudo: false
sudo: required
dist: trusty
dotnet: 2.1.105
mono:
- latest
os:
- linux
- osx
before_install:
- git fetch --unshallow # Travis always does a shallow clone, but GitVersion needs the full history including branches and tags
- git fetch --unshallow # Travis always does a shallow clone, but GitVersion needs the full history including branches and tags
script:
- ./build.sh
cache:
directories:
- src/packages
- tools
- ./build.sh -v Diagnostic
env:
global:
- DOTNET_CLI_TELEMETRY_OPTOUT: 1
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ We love contributions to get started contributing you might need:
- [Get started with git](http://rogerdudler.github.io/git-guide)
- [How to create a pull request](https://help.github.com/articles/using-pull-requests)
- [An issue to work on](https://github.com/GitTools/GitVersion/labels/up-for-grabs) - We are on [Up for grabs](http://up-for-grabs.net/), our up for grabs issues are tagged `up-for-grabs`
- An understanding of our [http://gitversion.readthedocs.org/en/latest/more-info/how-it-works/#architecture](#architecture) and how [we write tests](#writing-tests)
- An understanding of our [architecture](http://gitversion.readthedocs.org/en/latest/more-info/how-it-works/#architecture) and how [we write tests](#writing-tests)

Once you know how to create a pull request and have an issue to work on, just post a comment saying you will work on it.
If you end up not being able to complete the task, please post another comment so others can pick it up.
Expand Down
4 changes: 3 additions & 1 deletion GitVersion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ branches:
master:
tag: beta
ignore:
sha: []
sha:
- 0e77e2e16a136a1cd0f0474fe5710f617d508d81
- af73f6a349456f146a8d0a413de1331eddf61bc2
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Tip: If you get `System.TypeInitializationException: The type initializer for
'LibGit2Sharp.Core.NativeMethods' threw an exception. --->
System.DllNotFoundException: lib/linux/x86_64/libgit2-baa87df.so`

You likely need to install `libcurl3`. Run `sudo get-get install libcurl3`
You likely need to install `libcurl3`. Run `sudo apt-get install libcurl3`

## Quick Links
- [Documentation][docs]
Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
image: Visual Studio 2017
install:
npm i -g tfx-cli

Expand Down
Loading

0 comments on commit 39fc8ac

Please sign in to comment.