diff --git a/.github/workflows/gitflow.yml b/.github/workflows/gitflow.yml index 5df9ad4..cf5a38e 100644 --- a/.github/workflows/gitflow.yml +++ b/.github/workflows/gitflow.yml @@ -190,15 +190,17 @@ jobs: ref: ${{ env.SOURCE_COMMIT }} token: ${{ env.TOKEN }} - - name: Checkout commit + - name: Checkout branch and commit run: | + git fetch origin ${{ env.SOURCE_BRANCH }} && git checkout ${{ env.SOURCE_BRANCH }} || : git fetch origin ${{ env.SOURCE_COMMIT }} || : git fetch origin ${{ env.DESTINATION_COMMIT }} || : - name: Check feature branch id: check-feature-branch if: | - github.event.pull_request.merged != true + github.event.pull_request.action != 'closed' + && github.event.pull_request.merged != true && steps.check-branch.outcome == 'success' && steps.check-branch.outputs.type == 'feature' run: | @@ -275,7 +277,8 @@ jobs: - name: Check release branch id: check-release-branch if: | - github.event.pull_request.merged != true + github.event.pull_request.action != 'closed' + && github.event.pull_request.merged != true && steps.check-branch.outcome == 'success' && steps.check-branch.outputs.type == 'release' run: | diff --git a/changelog.md b/changelog.md index a9e92fa..3667472 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,7 @@ +## 2.3.1 + +- fix: solve issue that auto-unreleased-commit feature is not working + ## 2.3.0 - feature: add dependabot to default feature branches