infrastructure/gitlab-ci
2
0
Fork 0
Code Issues 17 Pull Requests 1 Actions Projects Releases 21 Wiki Activity

version bump from rc which has breaking change, only bumps to non rc version. #13

New Issue
Open
opened 2022-01-16 01:01:44 +00:00 by jon_nfc · 9 comments
jon_nfc commented 2022-01-16 01:01:44 +00:00 (Migrated from gitlab.com)
Copy Link

📚 Summary

During version bump at commit 5f273ce23a current version was 0.3.0rc1 a breaking change was added within the commit and the version only incremented to 0.3.0 when it should have incremented to 1.0.0.

Git log output for commits in question 
$ git log
commit 5f273ce23a331eaf11623207ec4aba8b856c14f0 (HEAD)
Author: Jon Lockwood <{redacted}>
Date:   Sat Aug 7 14:56:51 2021 +0930

    docs(gitlab_release): Updated docs with new instructions on version incrementing
    
    BREAKING CHANGE: !2

commit f76cabeeb04b028a231dc1c232862db5fcad4345
Author: Jon Lockwood <{redacted}>
Date:   Sat Aug 7 13:56:25 2021 +0930

    fix(gitlab_release): Adjust release workflow
    
    Previous release workflow only allowed version increment of RC on development brnach.
    
    adjust to the following workflow:
        master branch: automatically increment the version
        development branch: option to manually increment version (RC increment only)
    
    !2

commit eb5cc8a0e2885a9ed16a8d1a81611aec4d5a4d31 (tag: v0.3.0rc1)
Author: NFC CI <{redacted}>
Date:   Wed Aug 4 03:23:08 2021 +0000

    build(version): bump version 0.3.0rc0 → 0.3.0rc1

command output version bump where breaking change is included:

$ cz -n cz_nfc bump --dry-run
build(version): bump version 0.3.0rc1 → 0.3.0
tag to create: v0.3.0
increment detected: PATCH

❓ Expected Result

Even though the release at the time was a release candidate rc1, due to there being a breaking change, the MAJOR version number should have incremented.

Links / References:

👷 Tasks

  • ensure that if a breaking change is committed that the major version number increases.

  • change tested, works from any minor including rc to a MAJOR release

## :books: Summary During version bump at commit 5f273ce23a331eaf11623207ec4aba8b856c14f0 current version was `0.3.0rc1` a breaking change was added within the commit and the version only incremented to `0.3.0` when it should have incremented to `1.0.0`. <details> <summary> Git log output for commits in question </summary> ``` bash $ git log commit 5f273ce23a331eaf11623207ec4aba8b856c14f0 (HEAD) Author: Jon Lockwood <{redacted}> Date: Sat Aug 7 14:56:51 2021 +0930 docs(gitlab_release): Updated docs with new instructions on version incrementing BREAKING CHANGE: !2 commit f76cabeeb04b028a231dc1c232862db5fcad4345 Author: Jon Lockwood <{redacted}> Date: Sat Aug 7 13:56:25 2021 +0930 fix(gitlab_release): Adjust release workflow Previous release workflow only allowed version increment of RC on development brnach. adjust to the following workflow: master branch: automatically increment the version development branch: option to manually increment version (RC increment only) !2 commit eb5cc8a0e2885a9ed16a8d1a81611aec4d5a4d31 (tag: v0.3.0rc1) Author: NFC CI <{redacted}> Date: Wed Aug 4 03:23:08 2021 +0000 build(version): bump version 0.3.0rc0 → 0.3.0rc1 ``` </details> command output version bump where breaking change is included: ``` bash $ cz -n cz_nfc bump --dry-run build(version): bump version 0.3.0rc1 → 0.3.0 tag to create: v0.3.0 increment detected: PATCH ``` ### :question: Expected Result Even though the release at the time was a release candidate `rc1`, due to there being a breaking change, the `MAJOR` version number should have incremented. ### Links / References: - [commitizen Github issue 472](https://github.com/commitizen-tools/commitizen/issues/472) - commitizen version: (test machine 2.17.13) however CI uses current as of date of job. Also tested with `cz-0.0.0.0.dev20200924` - BREAKING CHANGE commit [5f273ce23a331eaf11623207ec4aba8b856c14f0](https://gitlab.com/nofusscomputing/projects/gitlab-ci/-/tree/5f273ce23a331eaf11623207ec4aba8b856c14f0) - custom module [cz_nfc](https://gitlab.com/nofusscomputing/projects/gitlab-ci/-/tree/5f273ce23a331eaf11623207ec4aba8b856c14f0/gitlab_release/python-module/cz_nfc) ### :construction_worker: Tasks - [ ] ensure that if a breaking change is committed that the major version number increases. - [ ] change tested, works from any minor including `rc` to a `MAJOR` release
jon_nfc commented 2022-01-16 02:58:40 +00:00 (Migrated from gitlab.com)
Copy Link

changed the description

changed the description
jon_nfc commented 2022-01-16 02:58:56 +00:00 (Migrated from gitlab.com)
Copy Link

added 2h of time spent

added 2h of time spent
jon_nfc commented 2022-01-22 12:30:00 +00:00 (Migrated from gitlab.com)
Copy Link

mentioned in merge request !16

mentioned in merge request !16
jon_nfc commented 2022-01-30 06:00:42 +00:00 (Migrated from gitlab.com)
Copy Link

mentioned in issue #17

mentioned in issue #17
jon_nfc commented 2022-01-30 06:02:06 +00:00 (Migrated from gitlab.com)
Copy Link

mentioned in merge request !17

mentioned in merge request !17
nfc_bot commented 2022-08-26 01:12:53 +00:00 (Migrated from gitlab.com)
Copy Link

mentioned in issue nofusscomputing/ops#55

mentioned in issue nofusscomputing/ops#55
nfc_bot commented 2022-09-26 00:31:14 +00:00 (Migrated from gitlab.com)
Copy Link

mentioned in issue nofusscomputing/ops#67

mentioned in issue nofusscomputing/ops#67
jon_nfc commented 2024-02-16 13:30:46 +00:00 (Migrated from gitlab.com)
Copy Link

Issue confirmed with version commitizen-3.14.1-py3-none-any.whl

Source job with feat: https://gitlab.com/nofusscomputing/projects/ansible/collections/ci-test/-/pipelines/1179384262
job name: merge check
Old version: 0.1.0-a2
New Version: 0.1.0-a3
Python: 3.11
MR: nofusscomputing/projects/ansible/collections/ci-test!7
CI Templates: nofusscomputing/projects/gitlab-ci!75

As the difference between the two was a feat bump, it should have gone to 0.2.0-a1

# Issue confirmed with version commitizen-3.14.1-py3-none-any.whl Source job with feat: https://gitlab.com/nofusscomputing/projects/ansible/collections/ci-test/-/pipelines/1179384262 job name: merge check Old version: `0.1.0-a2` New Version: `0.1.0-a3` Python: `3.11` MR: nofusscomputing/projects/ansible/collections/ci-test!7 CI Templates: nofusscomputing/projects/gitlab-ci!75 As the difference between the two was a feat bump, it should have gone to `0.2.0-a1`
jon_nfc commented 2024-02-16 13:50:12 +00:00 (Migrated from gitlab.com)
Copy Link

also broken for fix bump

old version: 0.1.0-a3
new version: 0.1.0-a4
Pipeline with fix commit: https://gitlab.com/nofusscomputing/projects/ansible/collections/ci-test/-/pipelines/1179413601
job name: merge check
MR: nofusscomputing/projects/ansible/collections/ci-test!8

ver bump should be 0.1.1-a1

# also broken for fix bump old version: `0.1.0-a3` new version: ` 0.1.0-a4` Pipeline with fix commit: https://gitlab.com/nofusscomputing/projects/ansible/collections/ci-test/-/pipelines/1179413601 job name: merge check MR: nofusscomputing/projects/ansible/collections/ci-test!8 ver bump should be `0.1.1-a1`
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
Bug
Used in discussion about a bug in comments or commits
CVE-2023-5764
Denotes items related to the CVE
CodeReview
Used in comments (issues/MR/commits) to denote code review related items
Documentation
Documentation items
Feature
Used in discussion about a Feature in comments or commits
Lint
Used in comments (issues/MR/commits) to denote lint tasks todo, done, fixed
Privacy
Used in comments (issues/MR/commits) to denote privacy related items
Security
Used in comments (issues/MR/commits) to denote Security related items
breaking-change
label used to denote that the issue/Merge Request does/will introduce a breaking change
bug::reproducable
Given to an issue when the bug has been confirmed as re-producable. Can also be used in comments and commits.
bug::unable to reproduce
Given to an issue when the bug that is not able to be reproduced. Can also be used in comments and commits.
code review::complete
code review::not started
code review::rejected
code review::underway
difficulty::Full Development
Level 3. Difficulty representing that the task to complete must be planned and created.
difficulty::Good First Issue
Level 1. Difficulty representing that the task is very simple and with limited knowledge can be completed.
difficulty::Prior Knowledge
Level 2. Difficulty representing that the task requires some prior knowledge of either the technology or the project for task completion.
documentation::complete
Issues, Merge Requests
documentation::no change required
Issues, Merge Requests and used to denote no documentation changes required
documentation::not started
Issues, Merge Requests
documentation::stalled
Issues, Merge Requests
documentation::underway
Issues, Merge Requests
impact::0
impact::1
impact::2
impact::3
impact::4
impact::5
ops::ansible-roles
OPS project tag
ops::automation
ops::gitlab-ci
OPS project tag
ops::marcas
OPS project tag
ops::python-gitlab-management
OPS project tag
ops::website
priority::0
priority::1
priority::2
priority::3
priority::4
priority::5
stage::Ready for Development
stage::develop
Stage for use in Issues and Merge Requests. Can also be used in discussion in comments and commits
stage::feedback required
stage::planning
Stage for use in Issues and Merge Requests. Can also be used in discussion in comments and commits
stage::test
Stage for use in Issues and Merge Requests. Can also be used in discussion in comments and commits
stale
Label given to issues/merge requests that are considered stale due to no collaboration and is a mark for closure.
triage
Tag given to issues/merge requests requiring triaging by the team.
triage::not_confidential
This tag is given by the triage bot so that URLs can be added to an issue/comment. A triage policy for NFC wide should remove this label.
type::CI / CD
type::automation
This type is used to denote an automation job
type::bug
Type for Issues and Merge Requests. Can also be used in discussion in comments and commits
type::compliance
type::discussion
Type for Issues. Can also be used in discussion in comments.
type::documentation
Type for Issues and Merge Requests. Can also be used in discussion in comments and commits
type::feature
type for Issues and Merge Requests. Can also be used in discussion in comments and commits
type::invalid
label given to tickets that require no action or are deem as invalid.
type::quality assurance
Type for Issues and Merge Requests. Can also be used in discussion in comments and commits
type::question
Type for Issues. Can also be used in discussion in comments.
type::security
Type for Issues and Merge Requests.
type::specification
Design specification
workflow::complete
Issues, Merge Requests
workflow::not ready
workflow::not ready::blocked
workflow::not started
Issues, Merge Requests
workflow::ready to commence
Issues, Merge Requests
workflow::stalled
Label given to issues/merge requests where no work has occured in x days iaw triage policy.
workflow::underway
Issues, Merge Requests
workflow::underway::develop
Area/CI-CD
Documentation changes
Area/Documentation
Documentation changes
Area/Security
This is security issue
Area/Testing
Issue or pull request related to testing
Bug
Failure to Confirm
Bug exists due to not confirming/testing code
Bug
Regression
THe bug is a regression of a feature
Bug
To be Confirmed
This bug is not confirmed
Bug
Unable to Reproduce
A developer can not re-create/re-produce the bug
Compat/Breaking
Breaking change that won't be backward compatible
Impact
Critical
1
The impact is critical in that it is blocking or prevents usage.
Impact
High
2
The impact requires that changes be made for continuted usage.
Impact
Low
4
The impact requires the user approach from a different angle for continued usage.
Impact
Medium
3
The impact requires a workaround for continued usage.
Impact
Very Low
5
The impact has a slight effect on usage.
Priority
High
2
The priority is high
Priority
Low
4
The priority is low
Priority
Medium
3
The priority is medium
Priority
Very High
1
The priority is critical
Priority
Very Low
5
The priority is very low
Reviewed
Confirmed
1
Issue has been confirmed
Reviewed
Duplicate
2
This issue or pull request already exists
Reviewed
Invalid
3
Invalid issue
Reviewed
Won't Fix
3
This issue won't be fixed
Status
Abandoned
3
Somebody has started to work on this but abandoned work
Status
Blocked
1
Something is blocking this issue or pull request
Status
Need More Info
2
Feedback is required to reproduce issue or to continue work
Type
Bug
Something is not working
Type
Epic
Epic User Story
Type
Feature
Feature / Module
Type
Incident
Something occured related to a service
Type
RFE
Request for Enhancement
Type
Task
A work item that must be done
Urgency
Low
4
Prioritize this amoungst your list of things to do.
Urgency
Major
1
Urgency is so high it should have been dealt with last week.
Urgency
Medium
3
Start as soon as possible.
Urgency
Very High
2
Urgency is high enough to warrant near immediate commencement.
Urgency
Very Low
5
Add this to your list of things to do.
No Label
difficulty::Full Development
impact::5
priority::4
type::bug
workflow::not started
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
jason jon
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: infrastructure/gitlab-ci#13
No description provided.
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?