From bf935b0be4a58e422596892677e40491699e4a56 Mon Sep 17 00:00:00 2001 From: Release Cut Date: Wed, 16 Dec 2020 06:15:25 +0000 Subject: [PATCH 1/3] update version for hotfix-1.5.1 --- CHANGELOG.md | 2 ++ README.md | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb94cde..1d5aa45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ +release-1.5.0 +----------------- release-1.5.0 ----------------- - feature: try to update changelog in release cut and hotfix cut diff --git a/README.md b/README.md index 9483efb..a78b450 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ --- -Version: 1.5.0 +Version: 1.5.1 --- # Test Github Actions From 62a08f43820e902d5b311655e809f032666cc46a Mon Sep 17 00:00:00 2001 From: Devlin Junker Date: Tue, 15 Dec 2020 22:18:22 -0800 Subject: [PATCH 2/3] fix: use RELEASE_NAME and pr_allow_empty --- .github/workflows/hotfix-cut.yml | 3 ++- .github/workflows/release-cut.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/hotfix-cut.yml b/.github/workflows/hotfix-cut.yml index 3fbe719..467ccc5 100644 --- a/.github/workflows/hotfix-cut.yml +++ b/.github/workflows/hotfix-cut.yml @@ -56,9 +56,10 @@ jobs: source_branch: hotfix-${{ steps.version.outputs.major }}.${{ steps.version.outputs.minor }}.${{ steps.version.outputs.patch }} destination_branch: "main" pr_title: hotfix-${{ steps.version.outputs.major }}.${{ steps.version.outputs.minor }}.${{ steps.version.outputs.patch }} + pr_allow_empty: true pr_body: " # TODO: - - [ ] Update CHANGELOG.mc + - [ ] Update CHANGELOG.md " diff --git a/.github/workflows/release-cut.yaml b/.github/workflows/release-cut.yaml index a46eebc..93c88e0 100644 --- a/.github/workflows/release-cut.yaml +++ b/.github/workflows/release-cut.yaml @@ -44,7 +44,7 @@ jobs: "`; echo "$NEW$([ -f CHANGELOG.md ] && less CHANGELOG.md)" > CHANGELOG.md; git add CHANGELOG.md; - git commit -m "update CHANGELOG before $RELEASE"; + git commit -m "update CHANGELOG before $RELEASE_NAME"; git push; env: RELEASE_NAME: release-${{ steps.version.outputs.major }}.${{ steps.version.outputs.minor }}.${{ steps.version.outputs.patch }} From 7d3250e8b5f63cc6eef6c2f26fb5cae935f6f682 Mon Sep 17 00:00:00 2001 From: Devlin Junker Date: Tue, 15 Dec 2020 22:19:05 -0800 Subject: [PATCH 3/3] fix: test --- .github/workflows/hotfix-cut.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/hotfix-cut.yml b/.github/workflows/hotfix-cut.yml index 467ccc5..037d4b5 100644 --- a/.github/workflows/hotfix-cut.yml +++ b/.github/workflows/hotfix-cut.yml @@ -62,5 +62,4 @@ jobs: - [ ] Update CHANGELOG.md " - # pr_label: release \ No newline at end of file