Skip to content

Commit

Permalink
Restore git work to git release stage and dont allow version tag builds
Browse files Browse the repository at this point in the history
  • Loading branch information
martinsmith1968 committed Dec 31, 2019
1 parent 7bca831 commit 1ea7e74
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 17 deletions.
24 changes: 9 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ solution: $APPNAME.sln
language: csharp
mono: none

branches:
except:
- v*

stages:
- name: build
- name: deploy
Expand Down Expand Up @@ -49,14 +53,6 @@ jobs:
dotnet: 2.2.102
install: dotnet restore
script: dotnet build
before_deploy:
- FILE=$(ls $APPNAME/bin/$CONFIGURATION/$APPNAME.*.nupkg)
- echo $FILE
- VERSION=$(echo $FILE | sed -e "s/$APPNAME\/bin\/$CONFIGURATION\/$APPNAME.//g" -e 's/.nupkg//g')
- echo $VERSION
- export TRAVIS_TAG=v$VERSION
- echo $TRAVIS_TAG
- git tag -f "$TRAVIS_TAG"
deploy:
provider: script
skip_cleanup: true
Expand All @@ -70,11 +66,11 @@ jobs:
install: dotnet restore
script: dotnet build
before_deploy:
- #FILE=$(ls $APPNAME/bin/$CONFIGURATION/$APPNAME.*.nupkg)
- #echo $FILE
- #VERSION=$(echo $FILE | sed -e "s/$APPNAME\/bin\/$CONFIGURATION\/$APPNAME.//g" -e 's/.nupkg//g')
- #echo $VERSION
- #export TRAVIS_TAG=v$VERSION
- FILE=$(ls $APPNAME/bin/$CONFIGURATION/$APPNAME.*.nupkg)
- echo $FILE
- VERSION=$(echo $FILE | sed -e "s/$APPNAME\/bin\/$CONFIGURATION\/$APPNAME.//g" -e 's/.nupkg//g')
- echo $VERSION
- export TRAVIS_TAG=v$VERSION
- echo $TRAVIS_TAG
- git tag -f "$TRAVIS_TAG"
deploy:
Expand All @@ -84,5 +80,3 @@ jobs:
file_glob: true
file:
- "$APPNAME/bin/$CONFIGURATION/$APPNAME.*.nupkg"
on:
tags: true
4 changes: 2 additions & 2 deletions DNX.Helpers/DNX.Helpers.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<PackageIconUrl>https://raw.githubusercontent.com/martinsmith1968/DNX.Helpers/master/images/favicon-32x32.png</PackageIconUrl>
<PackageTags>DNX helpers extensions string array linq</PackageTags>
<PackageReleaseNotes>Interpolation to a working version and some preparation for moving to .NET Standard</PackageReleaseNotes>
<Version>2.0.6</Version>
<AssemblyVersion>2.0.6</AssemblyVersion>
<Version>2.0.7</Version>
<AssemblyVersion>2.0.7</AssemblyVersion>
</PropertyGroup>
<ItemGroup>
<None Remove="Converters\BuiltInTypes\Build.cmd" />
Expand Down

0 comments on commit 1ea7e74

Please sign in to comment.