Skip to content

Commit

Permalink
Merge pull request #117 from baynezy/release/2.0.1.2
Browse files Browse the repository at this point in the history
Release version 2.0.1.2
  • Loading branch information
baynezy committed May 20, 2024
2 parents 2d6c519 + cb2f457 commit 761ccbb
Show file tree
Hide file tree
Showing 16 changed files with 45 additions and 64 deletions.
15 changes: 6 additions & 9 deletions .github/workflows/branch-hotfix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,15 @@ jobs:
run: |
echo "patch_version=$(($(cat semver.json | jq -r '.patch')+1))" > $GITHUB_OUTPUT
- name: Store New Version
uses: RadovanPelka/github-action-json@v1.0.1
uses: Afterlife-Guide/SemVer.Action@1.0.3.8
with:
path: semver.json
replaceWith: |
{
"major": "${{ needs.get-version.outputs.major }}",
"minor": "${{ needs.get-version.outputs.minor }}",
"patch": "${{ steps.increment_version.outputs.patch_version }}",
"build": "${{ github.run_number }}"
}
major-version: ${{ needs.get-version.outputs.major }}
minor-version: ${{ needs.get-version.outputs.minor }}
patch-version: ${{ steps.increment_version.outputs.patch_version }}
build-version: ${{ github.run_number }}
- name: Update changelog
uses: thomaseizinger/keep-a-changelog-new-release@1.3.0
uses: thomaseizinger/keep-a-changelog-new-release@3.0.0
with:
tag: ${{ needs.get-version.outputs.major }}.${{ needs.get-version.outputs.minor }}.${{ steps.increment_version.outputs.patch_version }}.${{ github.run_number }}
- name: Commit Changes
Expand Down
15 changes: 6 additions & 9 deletions .github/workflows/draft-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,16 @@ jobs:
run: git checkout -b release/${{ github.event.inputs.major_version }}.${{ github.event.inputs.minor_version }}.${{ github.event.inputs.patch_version }}.${{ github.run_number }}

- name: Update Version Number
uses: RadovanPelka/github-action-json@v1.0.1
uses: Afterlife-Guide/SemVer.Action@1.0.3.8
with:
path: semver.json
replaceWith: |
{
"major": "${{ github.event.inputs.major_version }}",
"minor": "${{ github.event.inputs.minor_version }}",
"patch": "${{ github.event.inputs.patch_version }}",
"build": "${{ github.run_number }}"
}
major-version: ${{ github.event.inputs.major_version }}
minor-version: ${{ github.event.inputs.minor_version }}
patch-version: ${{ github.event.inputs.patch_version }}
build-version: ${{ github.run_number }}

- name: Update changelog
uses: thomaseizinger/keep-a-changelog-new-release@1.3.0
uses: thomaseizinger/keep-a-changelog-new-release@3.0.0
with:
tag: ${{ github.event.inputs.major_version }}.${{ github.event.inputs.minor_version }}.${{ github.event.inputs.patch_version }}.${{ github.run_number }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/step-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
uses: actions/checkout@v4
- name: Get Version
id: get-version
uses: RadovanPelka/github-action-json@v1.0.1
uses: Afterlife-Guide/SemVer.Action@1.0.3.8
with:
path: 'semver.json'
- id: set-version
Expand Down
8 changes: 8 additions & 0 deletions .idea/.idea.NHSNumberGenerator/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions .idea/.idea.NHSNumberGenerator/.idea/sonarlint.xml

This file was deleted.

Empty file.

This file was deleted.

Empty file.

This file was deleted.

6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.0.0.1] - 2024-04-25
## [2.0.1.2] - 2024-05-20

[Unreleased]: https://github.com/baynezy/NHSNumberGenerator/compare/2.0.0.1...HEAD
## [2.0.0.1] - 2024-04-25

[unreleased]: https://github.com/baynezy/NHSNumberGenerator/compare/2.0.1.2...HEAD
[2.0.1.2]: https://github.com/baynezy/NHSNumberGenerator/compare/2.0.0.1...2.0.1.2
[2.0.0.1]: https://github.com/baynezy/NHSNumberGenerator/compare/4a1504021dde423df19dadbbf8b42b210b86c96a...2.0.0.1
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# NHS Number Generator

This project is a .Net library to generate NHS numbers in the alid format.
This project is a .Net library to generate NHS numbers in the valid format.

[![Build Status](https://github.com/baynezy/NHSNumberGenerator/workflows/Test%20and%20Deploy%20Library/badge.svg)](https://github.com/baynezy/NHSNumberGenerator/actions?query=workflow%3ATest%20and%20Deploy%20Library)

| Branch | Status |
|-----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `master` | [![master](https://github.com/baynezy/NHSNumberGenerator/actions/workflows/branch-master.yml/badge.svg?branch=master)](https://github.com/baynezy/NHSNumberGenerator/actions/workflows/branch-master.yml) |
| `develop` | [![develop](https://github.com/baynezy/NHSNumberGenerator/actions/workflows/branch-develop.yml/badge.svg?branch=develop)](https://github.com/baynezy/NHSNumberGenerator/actions/workflows/branch-develop.yml) |

## Installation

Expand Down
7 changes: 1 addition & 6 deletions semver.json
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
{
"major": "2",
"minor": "0",
"patch": "0",
"build": "1"
}
{"major":"2","minor":"0","patch":"1","build":"2"}
9 changes: 3 additions & 6 deletions test/NHSNumberGenerator.Test/Drivers/Driver.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
namespace NHSNumberGenerator.Test.Drivers
{
public class Driver
{
}
}
namespace NHSNumberGenerator.Test.Drivers;

public class Driver;
3 changes: 3 additions & 0 deletions test/NHSNumberGenerator.Test/GlobalUsings.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Global using directives

global using Reqnroll;
11 changes: 4 additions & 7 deletions test/NHSNumberGenerator.Test/Hooks/Hook.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
namespace NHSNumberGenerator.Test.Hooks
{
[Binding]
public class Hooks
{
}
}
namespace NHSNumberGenerator.Test.Hooks;

[Binding]
public class Hooks;
11 changes: 3 additions & 8 deletions test/NHSNumberGenerator.Test/NHSNumberGenerator.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,13 @@
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<Using Include="TechTalk.SpecFlow" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="JunitXml.TestLogger" Version="3.1.12" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="NHSNumberValidator" Version="1.0.4.110" />
<PackageReference Include="NHSNumberValidator" Version="2.0.1.2" />
<PackageReference Include="Reqnroll.xUnit" Version="1.0.1" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="SpecFlow.Plus.LivingDocPlugin" Version="3.9.57" />
<PackageReference Include="SpecFlow.xUnit" Version="3.9.74" />
<PackageReference Include="xunit" Version="2.7.1" />
<PackageReference Include="xunit" Version="2.8.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down

0 comments on commit 761ccbb

Please sign in to comment.