Skip to content

Commit 0329be1

Browse files
ansidevansidev
authored
Release v1.1.0-rc.1 (#27)
2 parents cafab77 + 96927c3 commit 0329be1

File tree

6 files changed

+65
-23
lines changed

6 files changed

+65
-23
lines changed

‎.github/workflows/auto_merge_release_hotfix_into_develop.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: auto_merge_into_develop
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
branches:
8+
- develop
9+
10+
env:
11+
BRANCH_DEVELOP: develop
12+
13+
jobs:
14+
auto_merge_into_develop:
15+
name: Merge release into develop
16+
runs-on: ubuntu-latest
17+
permissions:
18+
contents: write
19+
# only merge pull requests that begin with 'release/' or 'hotfix/'
20+
if: startsWith(github.head_ref, 'release/') || startsWith(github.head_ref, 'hotfix/')
21+
22+
steps:
23+
- name: Merge PR
24+
env:
25+
PR_NUMBER: ${{ github.event.number }}
26+
PR_TITLE: Merge branch '${{ github.head_ref }}' into ${{ env.BRANCH_DEVELOP }}
27+
run: |
28+
gh pr merge ${PR_NUMBER} -m -d -t "${PR_TITLE}"

‎.github/workflows/draft_release_hotfix_pr.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,18 @@ jobs:
6969
Merging this PR will create the GitHub release ${{ env.TAG_PREFIX }}${{ env.RELEASE_VERSION }}.
7070
run: |
7171
PR_LABELS="automated-pr,${RELEASE_TYPE}-pr"
72+
73+
[[ ${PRE_RELEASE:false} == "true" ]] && ( gh label create 'pre-release' --force && PR_LABELS="$PR_LABELS,pre-release" )
74+
7275
for LABEL in $(echo $PR_LABELS | sed "s/,/ /g"); do gh label create $LABEL --force; done
73-
[[ ${PRE_RELEASE:false} == "true" ]] && gh label create 'pre-release' --force
7476
7577
PR_ID=$(gh pr list --state open --search "base:${{ env.BRANCH_MAIN }} head:${{ github.ref_name }}" | head -1 | cut -f1)
76-
[[ ! -z "$PR_ID" ]] && \
78+
[[ ! -z "$PR_ID" ]] && echo "PR was created with ID $PR_ID. Ignored!" || \
7779
gh pr create \
7880
--draft \
7981
--base "${{ env.BRANCH_MAIN }}" \
8082
--head "${{ github.ref_name }}" \
8183
--title "${{ env.PR_TITLE }}" \
8284
--body "${{ env.PR_BODY }}" \
8385
--label "${PR_LABELS}" \
84-
--fill \
85-
|| echo "PR was created. Ignored!"
86+
--fill

‎.github/workflows/release.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,3 @@ jobs:
7777
--body "${{ env.PR_BODY }}" \
7878
--label "${{ env.PR_LABEL }}" \
7979
--fill
80-
81-
PR_ID=$(gh pr list --state open --search "base:${{ env.BRANCH_DEVELOP }} head:${{ github.head_ref }}" | head -1 | cut -f1)
82-
[[ ! -z "$PR_ID" ]] && gh pr merge ${PR_ID} -m -d -t "${{ env.PR_TITLE }}" || echo "Empty PR ID. Ignored!"

‎CHANGELOG.md

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [1.1.0-rc.1](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.1.0-rc.0...v1.1.0-rc.1) (2023-02-14)
6+
7+
### Features
8+
9+
* **workflow-auto-merge-release-hotfix-into-develop:** add new workflow for auto merging release/hotfix into develop ([c9d2c41](https://github.com/ansidev/sample-gitflow-release-workflows/commit/c9d2c413e1c3e3aeb1d3c31c529b96f5c29e4bf5))
10+
11+
### Bug Fixes
12+
13+
* **workflow-draft-release-hotfix-pr:** correct wrong logic ([f36ddf1](https://github.com/ansidev/sample-gitflow-release-workflows/commit/f36ddf1e174e72b65b21efa41f623ce2371d0355))
14+
* **workflow-draft-release-hotfix-pr:** fix PR is missing label `pre-release` ([fe4d1e0](https://github.com/ansidev/sample-gitflow-release-workflows/commit/fe4d1e00b9d2517bbe0f89794ea2668bea5765fa))
15+
16+
### Documentations
17+
18+
* **readme:** update README.md ([bd62d5a](https://github.com/ansidev/sample-gitflow-release-workflows/commit/bd62d5abd674b76d452b3b1c151749ca572f3f79))
19+
520
## [1.1.0-rc.0](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.2...v1.1.0-rc.0) (2023-02-13)
621

722
### Features
@@ -12,62 +27,62 @@ All notable changes to this project will be documented in this file. See [standa
1227

1328
* **readme:** update README.md ([9175012](https://github.com/ansidev/sample-gitflow-release-workflows/commit/9175012bed48f47fc08e681983ad21f81e8e2f04))
1429

15-
### [1.0.2](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.2-rc.0...v1.0.2) (2023-02-13)
30+
## [1.0.2](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.2-rc.0...v1.0.2) (2023-02-13)
1631

1732
### Bug Fixes
1833

1934
* **github-actions:** fix PR body ([4701d3a](https://github.com/ansidev/sample-gitflow-release-workflows/commit/4701d3a33ea1f9563662ac0ddeb47ceb972e66d6))
2035

21-
### [1.0.2-rc.0](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.7...v1.0.2-rc.0) (2023-02-13)
36+
## [1.0.2-rc.0](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.7...v1.0.2-rc.0) (2023-02-13)
2237

2338
### Features
2439

2540
* **workflow-release:** auto create merge commit for PR on merging ([bc07fe5](https://github.com/ansidev/sample-gitflow-release-workflows/commit/bc07fe522fc2dbc8ea4171be7404a8870f4dce38))
2641
* **workflow-release:** auto merge PR after creating ([85a272f](https://github.com/ansidev/sample-gitflow-release-workflows/commit/85a272f377da0589b55bbc9420d933237f41ff6e))
2742

28-
### [1.0.1-rc.7](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.6...v1.0.1-rc.7) (2023-02-13)
43+
## [1.0.1-rc.7](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.6...v1.0.1-rc.7) (2023-02-13)
2944

3045
### Bug Fixes
3146

3247
* **github-actions:** fix failed command gh pr create ([c57d773](https://github.com/ansidev/sample-gitflow-release-workflows/commit/c57d773547c355bbff010a12d602f4abb0cb985d))
3348

34-
### [1.0.1-rc.6](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.5...v1.0.1-rc.6) (2023-02-13)
49+
## [1.0.1-rc.6](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.5...v1.0.1-rc.6) (2023-02-13)
3550

3651
### Bug Fixes
3752

3853
* **github-actions:** correct command flag value ([95af6a2](https://github.com/ansidev/sample-gitflow-release-workflows/commit/95af6a2f92adb1f3a6709c9225b3028aedbc5987))
3954

40-
### [1.0.1-rc.5](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.4...v1.0.1-rc.5) (2023-02-13)
55+
## [1.0.1-rc.5](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.4...v1.0.1-rc.5) (2023-02-13)
4156

4257
### Bug Fixes
4358

4459
* **github-actions:** revert wrong changes ([1e044df](https://github.com/ansidev/sample-gitflow-release-workflows/commit/1e044dfd9746afbe7263c484813a8a26920119bf))
4560

46-
### [1.0.1-rc.4](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.3...v1.0.1-rc.4) (2023-02-12)
61+
## [1.0.1-rc.4](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.3...v1.0.1-rc.4) (2023-02-12)
4762

4863
### Bug Fixes
4964

5065
* **github-actions:** fix fail steps and refactor code ([872d740](https://github.com/ansidev/sample-gitflow-release-workflows/commit/872d740b98dd15adc988079744656814229f37d5))
5166

52-
### [1.0.1-rc.3](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.2...v1.0.1-rc.3) (2023-02-12)
67+
## [1.0.1-rc.3](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.2...v1.0.1-rc.3) (2023-02-12)
5368

5469
### Bug Fixes
5570

5671
* **github-actions:** remove invalid command flag ([1794f4c](https://github.com/ansidev/sample-gitflow-release-workflows/commit/1794f4cc27e9053e6ddbbccd01d7d0895812d510))
5772

58-
### [1.0.1-rc.2](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.1...v1.0.1-rc.2) (2023-02-12)
73+
## [1.0.1-rc.2](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.1...v1.0.1-rc.2) (2023-02-12)
5974

6075
### Bug Fixes
6176

6277
* **github-actions:** add missing checkout step ([e20f63a](https://github.com/ansidev/sample-gitflow-release-workflows/commit/e20f63ababd316d413b9573c727c68717b3b480d))
6378

64-
### [1.0.1-rc.1](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.0...v1.0.1-rc.1) (2023-02-12)
79+
## [1.0.1-rc.1](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.1-rc.0...v1.0.1-rc.1) (2023-02-12)
6580

6681
### Bug Fixes
6782

6883
* **github-actions:** correct syntax ([dcea1b6](https://github.com/ansidev/sample-gitflow-release-workflows/commit/dcea1b6fde978a05ca3ff8855af26600e7a9f226))
6984

70-
### [1.0.1-rc.0](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.0-rc.1...v1.0.1-rc.0) (2023-02-12)
85+
## [1.0.1-rc.0](https://github.com/ansidev/sample-gitflow-release-workflows/compare/v1.0.0-rc.1...v1.0.1-rc.0) (2023-02-12)
7186

7287
### Features
7388

@@ -77,7 +92,7 @@ All notable changes to this project will be documented in this file. See [standa
7792

7893
* **github-actions:** rename repository secret variable GITHUB_TOKEN to GH_TOKEN ([5da410e](https://github.com/ansidev/sample-gitflow-release-workflows/commit/5da410ee04fe1151835df35f4795dab51d18aa18))
7994

80-
### 1.0.0-rc.1 (2023-02-12)
95+
## 1.0.0-rc.1 (2023-02-12)
8196

8297
### Features
8398

‎README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ Sample Gitflow release workflow using GitHub Actions and official [GitHub CLI](h
2222

2323
- Workflows
2424

25-
| Name | Description | File |
26-
| ----------------------- | ------------------------------ | -------------------------------------------------------------------------------- |
27-
| Release | Automate releasing | [release.yaml](./.github/workflows/release.yaml) |
28-
| Draft Release/Hotfix PR | Automate drafting a release PR | [draft_release_hotfix_pr.yaml](./.github/workflows/draft_release_hotfix_pr.yaml) |
25+
| Name | Description | File |
26+
| -------------------------------------- | ----------------------------------------------- | -------------------------------------------------------------------------------------------------------------- |
27+
| Release | Automate releasing | [release.yaml](./.github/workflows/release.yaml) |
28+
| Auto merge release/hotfix into develop | Automate merging release/hotfix PR into develop | [auto_merge_release_hotfix_into_develop.yaml](./.github/workflows/auto_merge_release_hotfix_into_develop.yaml) |
29+
| Draft release/hotfix PR | Automate drafting a release/hotfix PR | [draft_release_hotfix_pr.yaml](./.github/workflows/draft_release_hotfix_pr.yaml) |
2930

3031
- You have to update below env variables if necessary
3132

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.0-rc.0
1+
1.1.0-rc.1

0 commit comments

Comments
 (0)