Skip to content

Commit

Permalink
switch to MinVer
Browse files Browse the repository at this point in the history
  • Loading branch information
pwelter34 committed Jul 28, 2023
1 parent df186fc commit 69e4329
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 74 deletions.
24 changes: 15 additions & 9 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
name: Build

env:
DOTNET_NOLOGO: true
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
BUILD_PATH: '${{github.workspace}}/artifacts'
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}

on:
push:
branches:
- master
- 'release/*'
- develop
tags:
- 'v*'
pull_request:
branches:
- master
- 'release/*'
- develop

jobs:

Expand Down Expand Up @@ -41,11 +45,6 @@ jobs:
6.0.x
7.0.x
- name: Update Version
uses: dotnet/nbgv@master
with:
setAllVars: true

- name: Restore Dependencies
run: dotnet restore

Expand Down Expand Up @@ -83,7 +82,7 @@ jobs:
deploy:
runs-on: ubuntu-latest
needs: build
if: success() && github.event_name != 'pull_request' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release'))
if: success() && github.event_name != 'pull_request' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v'))

steps:
- name: Download Artifact
Expand All @@ -98,8 +97,15 @@ jobs:
dotnet nuget push $package --source https://nuget.pkg.github.com/loresoft/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
done
- name: Publish Packages feedz
run: |
for package in $(find -name "*.nupkg"); do
echo "${0##*/}": Pushing $package...
dotnet nuget push $package --source https://f.feedz.io/loresoft/open/nuget/index.json --api-key ${{ secrets.FEEDDZ_KEY }} --skip-duplicate
done
- name: Publish Packages Nuget
if: startsWith(github.ref, 'refs/heads/release')
if: startsWith(github.ref, 'refs/tags/v')
run: |
for package in $(find -name "*.nupkg"); do
echo "${0##*/}": Pushing $package...
Expand Down
44 changes: 0 additions & 44 deletions .github/workflows/release.yml

This file was deleted.

2 changes: 0 additions & 2 deletions MongoDB.Abstracts.sln
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{AEBC64A5
coverlet.runsettings = coverlet.runsettings
src\Directory.Build.props = src\Directory.Build.props
.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
.github\workflows\release.yml = .github\workflows\release.yml
version.json = version.json
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C480AF26-E87F-4ACA-9F34-047BDAE3A769}"
Expand Down
8 changes: 6 additions & 2 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,14 @@
<ImplicitUsings>enable</ImplicitUsings>
<NoWarn>1591</NoWarn>
</PropertyGroup>

<PropertyGroup>
<MinVerTagPrefix>v</MinVerTagPrefix>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="All" />
<PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
Expand All @@ -46,5 +50,5 @@
<Visible>false</Visible>
</None>
</ItemGroup>

</Project>
17 changes: 0 additions & 17 deletions version.json

This file was deleted.

0 comments on commit 69e4329

Please sign in to comment.