Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update: hotfix/2.3.1 to develop #30

Merged
merged 2 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/gitflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down