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

fix(gitlab_releases): version increment workflow from RC-release -> full-release #52

Merged
jon_nfc merged 2 commits from fix-releases into development 2021-08-07 05:32:00 +00:00
Conversation 28 Commits 2 Files Changed 2 +25 -19
jon_nfc commented 2021-08-04 06:10:54 +00:00 (Migrated from gitlab.com)
Copy Link

📚 Summary

Fix gitlab releases.

currently there is no way to got from RC to full release.

Workflow

Pseudo:

  1. Merge request occurs
  2. Changelog updated
  3. Tag created
  4. Gitlab release created

Changes made

Now the version doesn't auto increment a release-candidate version on the development branch. the job only auto increments on the master branch. WARNING: if a version increment is done on the development branch and there are no further commits on the development branch, the version increment on the master branch will fail.

New workflow

  1. if there is to be further work on the development branch, if desired the version can be incremented. (release-candidate version will be created).
  2. if there are no further commits to occur on the development branch, DO NOT increment the version.
  3. on merge to master the version will automatically increment to the applicable version.
🔗 Related Issue(s) 🔗 Related Merge Request(s)
#1 nofusscomputing/projects/gitlab-ci!1 {blocks}
nofusscomputing/infrastructure/ansible-roles!6 {blocks}

👷 Tasks

  • merging to correct branch?

  • issue linked to this MR?

  • related issues:

    • [ ] closed in a commit message

    • [ ] Manually closed

    • All related issues tasks complete?

## :books: Summary Fix gitlab releases. currently there is no way to got from RC to full release. ### Workflow Pseudo: 1. Merge request occurs 1. Changelog updated 1. Tag created 1. Gitlab release created ### Changes made Now the version doesn't auto increment a release-candidate version on the `development` branch. the job only auto increments on the `master` branch. **WARNING: if a version increment is done on the development branch and there are no further commits on the `development` branch, the version increment on the `master` branch will fail.** #### New workflow 1. if there is to be further work on the `development` branch, if desired the version can be incremented. (release-candidate version will be created). 1. if there are no further commits to occur on the `development` branch, **DO NOT** increment the version. 1. on merge to `master` the version will automatically increment to the applicable version. ----- | :link: **Related Issue(s)** | :link: **Related Merge Request(s)** | |:----:|:----:| | #1 | nofusscomputing/projects/gitlab-ci!1 {blocks} <br>nofusscomputing/infrastructure/ansible-roles!6 {blocks}| ### :construction_worker: Tasks <!-- dont remove tasks strike through including the checkbox by enclosing in double tidle '~~' --> - [ ] merging to correct branch? - [ ] issue linked to this MR? - related issues: - ~~[ ] closed in a commit message~~ - ~~[ ] Manually closed~~ - [ ] All related issues tasks complete? <!-- don't adjust the below slash commands -->
jon_nfc commented 2021-08-04 06:11:30 +00:00 (Migrated from gitlab.com)
Copy Link

changed title from feat(gitlab_releases) to feat(gitlab_releases){+: Ensure that a full release occurs when merging to master.+}

changed title from **feat(gitlab_releases)** to **feat(gitlab_releases){+: Ensure that a full release occurs when merging to master.+}**
jon_nfc commented 2021-08-04 06:17:46 +00:00 (Migrated from gitlab.com)
Copy Link

changed the description

changed the description
jon_nfc commented 2021-08-04 06:17:46 +00:00 (Migrated from gitlab.com)
Copy Link

assigned to @jon_nfc

assigned to @jon_nfc
jon_nfc commented 2021-08-04 06:18:28 +00:00 (Migrated from gitlab.com)
Copy Link

added 30m of time spent

added 30m of time spent
jon_nfc commented 2021-08-06 00:31:23 +00:00 (Migrated from gitlab.com)
Copy Link

changed the description

changed the description
jon_nfc commented 2021-08-07 02:34:01 +00:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

  • 7a65a55e - fix(gitlab_release): conduct the bump when merge request submitted

Compare with previous version

added 1 commit <ul><li>7a65a55e - fix(gitlab_release): conduct the bump when merge request submitted</li></ul> [Compare with previous version](/nofusscomputing/projects/gitlab-ci/-/merge_requests/2/diffs?diff_id=226421678&start_sha=eb5cc8a0e2885a9ed16a8d1a81611aec4d5a4d31)
jon_nfc commented 2021-08-07 02:35:24 +00:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

  • 43e065dc - fix(gitlab_release): conduct the bump when merge request submitted

Compare with previous version

added 1 commit <ul><li>43e065dc - fix(gitlab_release): conduct the bump when merge request submitted</li></ul> [Compare with previous version](/nofusscomputing/projects/gitlab-ci/-/merge_requests/2/diffs?diff_id=226421760&start_sha=7a65a55e0543da6c8432f4578ac62b922647e372)
jon_nfc commented 2021-08-07 02:40:26 +00:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

  • 46a5ee22 - fix(gitlab_release): conduct the bump when merge request submitted

Compare with previous version

added 1 commit <ul><li>46a5ee22 - fix(gitlab_release): conduct the bump when merge request submitted</li></ul> [Compare with previous version](/nofusscomputing/projects/gitlab-ci/-/merge_requests/2/diffs?diff_id=226422024&start_sha=43e065dcb6b035218671919089828374d1eb5f8b)
jon_nfc commented 2021-08-07 02:59:31 +00:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

  • fbb67716 - fix(gitlab_release): conduct the bump when merge request submitted

Compare with previous version

added 1 commit <ul><li>fbb67716 - fix(gitlab_release): conduct the bump when merge request submitted</li></ul> [Compare with previous version](/nofusscomputing/projects/gitlab-ci/-/merge_requests/2/diffs?diff_id=226423004&start_sha=46a5ee22604e7302f705cf44cb9ab0fbb0b65035)
jon_nfc commented 2021-08-07 03:00:27 +00:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

  • cb0129c1 - fix(gitlab_release): conduct the bump when merge request submitted

Compare with previous version

added 1 commit <ul><li>cb0129c1 - fix(gitlab_release): conduct the bump when merge request submitted</li></ul> [Compare with previous version](/nofusscomputing/projects/gitlab-ci/-/merge_requests/2/diffs?diff_id=226423068&start_sha=fbb677162a04c5d824012ee8ae507e12e1427c34)
jon_nfc commented 2021-08-07 03:02:33 +00:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

  • 274994bd - fix(gitlab_release): conduct the bump when merge request submitted

Compare with previous version

added 1 commit <ul><li>274994bd - fix(gitlab_release): conduct the bump when merge request submitted</li></ul> [Compare with previous version](/nofusscomputing/projects/gitlab-ci/-/merge_requests/2/diffs?diff_id=226423162&start_sha=cb0129c1b301a7001cd01269cea4a17c53c5a30e)
jon_nfc commented 2021-08-07 03:03:20 +00:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

  • 9d8b89e9 - fix(gitlab_release): conduct the bump when merge request submitted

Compare with previous version

added 1 commit <ul><li>9d8b89e9 - fix(gitlab_release): conduct the bump when merge request submitted</li></ul> [Compare with previous version](/nofusscomputing/projects/gitlab-ci/-/merge_requests/2/diffs?diff_id=226423217&start_sha=274994bd7e55e2ac753b82e0774b0d5792b41abe)
jon_nfc commented 2021-08-07 03:05:29 +00:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

  • 8b5190ea - build(test): testing

Compare with previous version

added 1 commit <ul><li>8b5190ea - build(test): testing</li></ul> [Compare with previous version](/nofusscomputing/projects/gitlab-ci/-/merge_requests/2/diffs?diff_id=226423374&start_sha=9d8b89e91c2ce2bf47d6ea542bfd3042debad92d)
jon_nfc commented 2021-08-07 03:06:50 +00:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

  • ca8024ac - build(test): testing

Compare with previous version

added 1 commit <ul><li>ca8024ac - build(test): testing</li></ul> [Compare with previous version](/nofusscomputing/projects/gitlab-ci/-/merge_requests/2/diffs?diff_id=226423437&start_sha=8b5190eafb328a13793f389d818c20909cb1385e)
jon_nfc commented 2021-08-07 03:18:50 +00:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

  • 45439a2e - test

Compare with previous version

added 1 commit <ul><li>45439a2e - test</li></ul> [Compare with previous version](/nofusscomputing/projects/gitlab-ci/-/merge_requests/2/diffs?diff_id=226424156&start_sha=eb5cc8a0e2885a9ed16a8d1a81611aec4d5a4d31)
jon_nfc commented 2021-08-07 03:33:44 +00:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

  • e04ec20a - fix(gitlab_release): on master branch, create full release

Compare with previous version

added 1 commit <ul><li>e04ec20a - fix(gitlab_release): on master branch, create full release</li></ul> [Compare with previous version](/nofusscomputing/projects/gitlab-ci/-/merge_requests/2/diffs?diff_id=226424919&start_sha=45439a2e77ad343bb8af8e8bcd0372793749853b)
jon_nfc commented 2021-08-07 03:50:51 +00:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

  • c85bbe91 - fix(gitlab_release): on master branch, create full release

Compare with previous version

added 1 commit <ul><li>c85bbe91 - fix(gitlab_release): on master branch, create full release</li></ul> [Compare with previous version](/nofusscomputing/projects/gitlab-ci/-/merge_requests/2/diffs?diff_id=226425962&start_sha=e04ec20ada3688357e0101bff801c3bfdeb301d7)
jon_nfc commented 2021-08-07 04:28:20 +00:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

  • 105df321 - fix(gitlab_release): Adjust release workflow

Compare with previous version

added 1 commit <ul><li>105df321 - fix(gitlab_release): Adjust release workflow</li></ul> [Compare with previous version](/nofusscomputing/projects/gitlab-ci/-/merge_requests/2/diffs?diff_id=226428366&start_sha=c85bbe914a19a7a29cbcc99ea2d539173e8b0fef)
jon_nfc commented 2021-08-07 04:35:48 +00:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

  • 682ffa36 - fix(gitlab_release): Adjust release workflow

Compare with previous version

added 1 commit <ul><li>682ffa36 - fix(gitlab_release): Adjust release workflow</li></ul> [Compare with previous version](/nofusscomputing/projects/gitlab-ci/-/merge_requests/2/diffs?diff_id=226428744&start_sha=105df321954f9e4aa93727a8d5623a511732abf5)
jon_nfc commented 2021-08-07 04:45:55 +00:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

  • 884bda84 - fix(gitlab_release): Adjust release workflow

Compare with previous version

added 1 commit <ul><li>884bda84 - fix(gitlab_release): Adjust release workflow</li></ul> [Compare with previous version](/nofusscomputing/projects/gitlab-ci/-/merge_requests/2/diffs?diff_id=226429238&start_sha=682ffa36eb305e4db3426b609994fd9d0e336973)
jon_nfc commented 2021-08-07 04:51:58 +00:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

  • 8267e91d - fix(gitlab_release): Adjust release workflow

Compare with previous version

added 1 commit <ul><li>8267e91d - fix(gitlab_release): Adjust release workflow</li></ul> [Compare with previous version](/nofusscomputing/projects/gitlab-ci/-/merge_requests/2/diffs?diff_id=226429603&start_sha=884bda849d91938b013b72a48dbf75c814400658)
jon_nfc commented 2021-08-07 05:15:12 +00:00 (Migrated from gitlab.com)
Copy Link

added 2 commits

  • f76cabee - fix(gitlab_release): Adjust release workflow
  • 1ca7a04e - docs(gitlab_release): Updated docs with new instructions on version incrementing

Compare with previous version

added 2 commits <ul><li>f76cabee - fix(gitlab_release): Adjust release workflow</li><li>1ca7a04e - docs(gitlab_release): Updated docs with new instructions on version incrementing</li></ul> [Compare with previous version](/nofusscomputing/projects/gitlab-ci/-/merge_requests/2/diffs?diff_id=226430881&start_sha=8267e91d1ce86aaa58ebde1bc451e597726d4ad0)
jon_nfc commented 2021-08-07 05:28:51 +00:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

  • 5f273ce2 - docs(gitlab_release): Updated docs with new instructions on version incrementing

Compare with previous version

added 1 commit <ul><li>5f273ce2 - docs(gitlab_release): Updated docs with new instructions on version incrementing</li></ul> [Compare with previous version](/nofusscomputing/projects/gitlab-ci/-/merge_requests/2/diffs?diff_id=226431716&start_sha=1ca7a04e365b12c46a26a24a2784e1f9c803e935)
jon_nfc commented 2021-08-07 05:30:47 +00:00 (Migrated from gitlab.com)
Copy Link

changed title from f{-eat-}(gitlab_releases): {-Ensure that a full release occurs when merging to master.-} to f{+ix+}(gitlab_releases): {+version increment workflow from RC-release -> full-release+}

changed title from **f{-eat-}(gitlab_releases): {-Ensure that a full release occurs when merging to master.-}** to **f{+ix+}(gitlab_releases): {+version increment workflow from RC-release -> full-release+}**
jon_nfc commented 2021-08-07 05:30:47 +00:00 (Migrated from gitlab.com)
Copy Link

changed the description

changed the description
jon_nfc commented 2021-08-07 05:32:00 +00:00 (Migrated from gitlab.com)
Copy Link

mentioned in commit cc2f23b091

mentioned in commit cc2f23b091925659c03196b69456f4033b460294
jon_nfc (Migrated from gitlab.com) merged commit cc2f23b091 into development 2021-08-07 05:32:00 +00:00
jon_nfc commented 2021-08-12 02:01:21 +00:00 (Migrated from gitlab.com)
Copy Link

mentioned in commit 5f273ce23a

mentioned in commit 5f273ce23a331eaf11623207ec4aba8b856c14f0
jon_nfc commented 2021-08-12 02:01:21 +00:00 (Migrated from gitlab.com)
Copy Link

mentioned in commit f76cabeeb0

mentioned in commit f76cabeeb04b028a231dc1c232862db5fcad4345
Sign in to join this conversation.
Reviewers
No Reviewers
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
type::bug
workflow::complete
Milestone
No items
No Milestone v1.0.0
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#52
No description provided.
Delete Branch "fix-releases"

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?