Skip to content

Commit

Permalink
Merge pull request #58 from devlinjunker/hotfix-1.0.2
Browse files Browse the repository at this point in the history
hotfix-1.0.2
  • Loading branch information
devlinjunker authored Dec 16, 2020
2 parents ad14194 + 496438d commit 820baf6
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/main-on-merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ jobs:
strategy:
max-parallel: 1
runs-on: ubuntu-latest
outputs:
major: ${{ steps.version.outputs.major }}
minor: ${{ steps.version.outputs.minor }}
patch: ${{ steps.version.outputs.patch }}
changelog: ${{ steps.version.outputs.changelog }}

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -43,7 +48,7 @@ jobs:
with:
tag_name: v${{ steps.version.outputs.major }}.${{ steps.version.outputs.minor }}.${{ steps.version.outputs.patch }}
release_name: release-${{ steps.version.outputs.major }}.${{ steps.version.outputs.minor }}.${{ steps.version.outputs.patch }}
body: '${{ steps.version.outputs.changelog }}'
body: ${{ steps.version.outputs.changelog }}

upmerge-after-release:
strategy:
Expand All @@ -65,4 +70,4 @@ jobs:
git commit -m "upmerge after $RELEASE";
git push;
env:
RELEASE: v${{ steps.version.outputs.major }}.${{ steps.version.outputs.minor }}.${{ steps.version.outputs.patch }}
RELEASE: v${{ needs.create-release-tag.outputs.major }}.${{ needs.create-release-tag.outputs.minor }}.${{ needs.create-release-tag.outputs.patch }}
2 changes: 1 addition & 1 deletion .github/workflows/release-cut.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
source_branch: release-${{ steps.version.outputs.major }}.${{ steps.version.outputs.minor }}
destination_branch: "main"
pr_title: release-${{ steps.version.outputs.major }}.${{ steps.version.outputs.minor }}
pr_body: '${{ steps.version.outputs.changelog }}'
pr_body: ${{ steps.version.outputs.changelog }}
# pr_label: release

# Note: This increments minor version only, for now major releases will be done manually
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
Version: 1.0.1
Version: 1.0.2
---

# Test Github Actions
Expand Down

0 comments on commit 820baf6

Please sign in to comment.