Skip to content

Commit 168d126

Browse files
authored
Merge pull request #85 from devlinjunker/patch-1.0.4
patch-1.0.4
2 parents bf53305 + 998a0ac commit 168d126

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

.github/workflows/main-on-merge.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ jobs:
3131
max-parallel: 1
3232
runs-on: ubuntu-latest
3333

34+
outputs:
35+
major: ${{ steps.version.outputs.major }}
36+
minor: ${{ steps.version.outputs.minor }}
37+
patch: ${{ steps.version.outputs.patch }}
38+
3439
steps:
3540
- uses: actions/checkout@v2
3641
with:
@@ -79,7 +84,7 @@ jobs:
7984
## This is a Personal Access Token from Admin User that allows us to bypass branch protections on develop
8085
token: ${{ secrets.PAT }}
8186
fetch-depth: 0
82-
87+
8388
- name: Upmerge develop After Release
8489
run: |
8590
git config --global user.name 'Release Cut';
@@ -88,4 +93,4 @@ jobs:
8893
git commit -m "upmerge after $RELEASE";
8994
git push;
9095
env:
91-
RELEASE: v${{ steps.version.outputs.major }}.${{ steps.version.outputs.minor }}.${{ steps.version.outputs.patch }}
96+
RELEASE: v${{ needs.create-release-tag.outputs.major }}.${{ needs.create-release-tag.outputs.minor }}.${{ needs.create-release-tag.outputs.patch }}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
Version: 1.0.3
2+
Version: 1.0.4
33
---
44

55
<img align="right" width="100" height="140" src="https://github.com/devlinjunker/template.github.semver/raw/develop/img/logo-small.png" alt="semver template logo">

scripts/hooks/post-commit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ FILE_LIMIT=25
2424
LINE_LIMIT=400
2525

2626
FILE_LIMIT_WARNING=" ! warning: more than $FILE_LIMIT files changed since $DIFF_COMMIT "
27-
LINE_LIMIT_WARNING=" ! warning: more than $LINE_LIMIT files changed since $DIFF_COMMIT "
27+
LINE_LIMIT_WARNING=" ! warning: more than $LINE_LIMIT lines changed since $DIFF_COMMIT "
2828

2929
NEW_BRANCH_CMDS="Remove warning: Create new branch with 'git checkout -b <branch_name>' then push to remote with 'git push --set-upstream <remote_name> <branch_name>'"
3030

0 commit comments

Comments
 (0)