Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

fix: ensures changelog files are up to date before adding entries #610

Merged
merged 4 commits into from
Mar 9, 2023

Conversation

noahnu
Copy link
Contributor

@noahnu noahnu commented Mar 9, 2023

Description

Addresses the changelog portion of #601. We move the changelog updates closer to the commit stage, and ensure we "refresh" the changelogs prior to prepending entries. This reduces the possibility of conflicts, assuming the pipeline running monodeploy takes appropriate measures to "lock" the publish stage (to limit concurrency). If a conflict is detected, we attempt a merge, preferring our changes over the remote.

@tophat-opensource-bot
Copy link
Collaborator

Monodeploy Publish Preview

This Pull Request introduces the following changes:

3.7.3 "@monodeploy/changelog" (2023-03-09)

Bug Fixes

  • ensures changelog files are up to date before adding entries (8c2837f)

3.7.3 "@monodeploy/git" (2023-03-09)

Bug Fixes

  • ensures changelog files are up to date before adding entries (8c2837f)

3.7.3 "@monodeploy/node" (2023-03-09)

Bug Fixes

  • ensures changelog files are up to date before adding entries (8c2837f)

3.7.3 "@monodeploy/publish" (2023-03-09)

Bug Fixes

  • ensures changelog files are up to date before adding entries (8c2837f)

@codecov
Copy link

codecov bot commented Mar 9, 2023

Codecov Report

Merging #610 (20c7344) into main (6bd64d6) will decrease coverage by 0.10%.
The diff coverage is 89.47%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #610      +/-   ##
==========================================
- Coverage   95.61%   95.52%   -0.10%     
==========================================
  Files          54       54              
  Lines        1460     1475      +15     
  Branches      349      354       +5     
==========================================
+ Hits         1396     1409      +13     
- Misses         64       66       +2     

@noahnu noahnu requested a review from dbasilio March 9, 2023 23:25
@noahnu noahnu marked this pull request as ready for review March 9, 2023 23:28
@noahnu noahnu merged commit c5a3460 into main Mar 9, 2023
@noahnu noahnu deleted the bugfix_601_checkout_approach branch March 9, 2023 23:31
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants