Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/anion0278/mapp
Browse files Browse the repository at this point in the history
  • Loading branch information
anion0278 committed Nov 17, 2021
2 parents 29dd740 + fafa177 commit 69286e3
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
required: true
default: '2' # minor
release_patch:
description: 'Release - patch number (previous 2)'
description: 'Release - patch number (previous 3)'
required: true
release_name:
description: 'Additional name of the release'
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
path: .
directory: ${{env.bin_dir}}
filename: ${{env.artifact_name}}
exclusions: '*.git* *.pdb /*runtimes/* ${{env.bin_dir}}runtimes/* ${{env.bin_dir}}runtimes/ ${{env.bin_dir}}runtimes ${{env.bin_dir}}ref/*'
exclusions: '*.git* *.pdb /*Invoice Converter/* /*Transactions Configs/* ${{env.bin_dir}}Invoice Converter/* ${{env.bin_dir}}Transactions Configs/ ${{env.bin_dir}}Transactions Configs'

- name: Create Release
uses: ncipollo/release-action@v1
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,13 @@ Total of 19 new changes since v3.2.1.8:

[skip ci]
- Merge branch 'master' of https://github.com/anion0278/mapp
\nNew release on ${{MERGED_AT}}
Total of 1 new changes since v3.2.2.15:
## 🧰 Chores

- chore: Automated report [skip ci]

## 📦 Uncategorized

- Update CHANGELOG.md
- Update ci_cd.yml
4 changes: 2 additions & 2 deletions Mapp.UI/Properties/SharedAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("2767955e-07e8-410d-83d2-8a27cf1d63d9")]

[assembly: AssemblyVersion("3.2.2.15")]
[assembly: AssemblyFileVersion("3.2.2.15")]
[assembly: AssemblyVersion("3.2.3.16")]
[assembly: AssemblyFileVersion("3.2.3.16")]

0 comments on commit 69286e3

Please sign in to comment.