Skip to content

Commit

Permalink
Merge pull request #35 from Didstopia/development
Browse files Browse the repository at this point in the history
Fixing Travis
  • Loading branch information
Dids committed Jul 23, 2018
2 parents 323874c + c7afb88 commit b77f383
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ sudo: false
# Skip the installation step
install: true

## NOTE: Conditionals are broken with tagged releases:
## https://github.com/Didstopia/PDFSharp/issues/34

# Additional jobs that run after tests
jobs:
fast_finish: true
Expand All @@ -29,7 +32,7 @@ jobs:
- dotnet pack -c ${BUILD_CONFIG} --no-build

- stage: Deploy to MyGet
if: (branch = development) AND (type != pull_request)
#if: (branch = development) AND (type != pull_request)
script: skip
deploy:
provider: script
Expand All @@ -41,7 +44,7 @@ jobs:
tags: false

- stage: Deploy to NuGet
if: branch = master
#if: branch = master
script: skip
deploy:
provider: script
Expand All @@ -54,7 +57,7 @@ jobs:
tags: false

- stage: Deploy to GitHub
if: branch = master
#if: branch = master
script:
- if [ ! -z "$TRAVIS_TAG" ]; then dotnet restore /p:PackageVersion=${TRAVIS_TAG#v}; else echo "Missing tag, skipping restore.."; fi
- if [ ! -z "$TRAVIS_TAG" ]; then dotnet build -c $BUILD_CONFIG /p:PackageVersion=${TRAVIS_TAG#v}; else echo "Missing tag, skipping build.."; fi
Expand Down

0 comments on commit b77f383

Please sign in to comment.