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

Re-introduce new version script #2438

Merged
merged 2 commits into from
Jan 28, 2022

Conversation

cincodenada
Copy link
Contributor

Purpose (TL;DR)

Because of the merge mess with #2426, the version command in package.json was reverted, so that the new version.sh script isn't being used.

Solution

This PR also puts the version.sh script back, and persists a prettier fix in a generated file back to the generation of the file, so it doesn't keep popping up.

How to verify - mandatory

The only way to really, test this is to run npm version, but if #2436 is merged first, then we'll have a way to run that without publishing a release!

Checklist for author

  • npm run lint passes
  • References to standard library functions are cached.

This was inadvertently removed during merge conflicts, and is required
for any of the new release process stuff to work
Otherwise this is just gonna keep popping up
@cincodenada cincodenada changed the title Re-introduce version command Re-introduce new version script Jan 28, 2022
@codecov
Copy link

codecov bot commented Jan 28, 2022

Codecov Report

Merging #2438 (e36f782) into master (a57bbf6) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2438   +/-   ##
=======================================
  Coverage   96.01%   96.01%           
=======================================
  Files          41       41           
  Lines        1906     1906           
=======================================
  Hits         1830     1830           
  Misses         76       76           
Flag Coverage Δ
unit 96.01% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.


Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a57bbf6...e36f782. Read the comment docs.

@cincodenada
Copy link
Contributor Author

cincodenada commented Jan 28, 2022

@fatso83 Okay, I ran through and simulated a clean merge of #2426 to make sure the end-result of all of this merging was the same as if things had gone more smoothly, and this was the only remaining difference I found.

I also snuck in the prettier change, and had a related question - do you have some sort of extra config for changes on your machine, or are you manually deleting the quoted bodies of the changelog, or is there something else going on? My changes command seems to generates a lot more detail in the changelogs than is showing up in your release commits, and I'm curious why!

@fatso83
Copy link
Contributor

fatso83 commented Jan 28, 2022

@cincodenada Yeah, I manually deleted all I regarded as noise for people browsing the changelog.

@@ -4,6 +4,7 @@ layout: default
title: Changelog
permalink: /releases/changelog
---

Copy link
Contributor

@fatso83 fatso83 Jan 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call. Was not sure where that came from (not that I was looking 😛 ).

@fatso83 fatso83 merged commit 91dab22 into sinonjs:master Jan 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants