Merge branch 'fix-release-process'

Author: fatso83

CHANGES.md

@@ -1,5 +1,6 @@
 # Changes
 
+<<<<<<< HEAD
 ## 13.0.0
 
 - [`cf3d6c0c`](https://github.com/sinonjs/sinon/commit/cf3d6c0cd9689c0ee673b3daa8bf9abd70304392)
@@ -201,6 +202,8 @@
 
 _Released by [Carl-Erik Kopseng](https://github.com/fatso83) on 2022-01-28._
 
+=======
+>>>>>>> parent of 41710467 (Adjust deploy scripts to archive old releases in a separate branch, move existing releases out of master (#2426))
 ## 12.0.1
 
 - [`3f598221`](https://github.com/sinonjs/sinon/commit/3f598221045904681f2b3b3ba1df617ed5e230e3)

docs/_config.yml

@@ -5,7 +5,11 @@ description: >-
 url: 'https://sinonjs.org'
 github_username: sinonjs
 sinon:
+<<<<<<< HEAD
   current_release: v13.0.0
+=======
+  current_release: v12.0.1
+>>>>>>> parent of 41710467 (Adjust deploy scripts to archive old releases in a separate branch, move existing releases out of master (#2426))
 markdown: kramdown
 kramdown:
   input: GFM

docs/changelog.md

@@ -4,6 +4,7 @@ title: Changelog
 permalink: /releases/changelog
 ---
 # Changelog
+<<<<<<< HEAD
 
 ## 13.0.0
 
@@ -205,13 +206,23 @@ permalink: /releases/changelog
   Add release documentation for v12.0.1 (Carl-Erik Kopseng)
 
 _Released by [Carl-Erik Kopseng](https://github.com/fatso83) on 2022-01-28._
+=======
+# Changes
+>>>>>>> parent of 41710467 (Adjust deploy scripts to archive old releases in a separate branch, move existing releases out of master (#2426))
 
 ## 12.0.1
 
 - [`3f598221`](https://github.com/sinonjs/sinon/commit/3f598221045904681f2b3b3ba1df617ed5e230e3)
   Fix issue with npm unlink for npm version > 6 (Carl-Erik Kopseng)
+    >
+    > 'npm unlink' would implicitly unlink the current dir
+    > until version 7, which requires an argument
+    >
 - [`51417a38`](https://github.com/sinonjs/sinon/commit/51417a38111eeeb7cd14338bfb762cc2df487e1b)
   Fix bundling of cjs module (#2412) (Julian Grinblat)
+    >
+    > * Fix bundling of cjs module    >
+    > * Run prettier
 
 _Released by [Carl-Erik Kopseng](https://github.com/fatso83) on 2021-11-04._
 

package.json

@@ -55,7 +55,7 @@
     "prettier:check": "prettier --check '**/*.{js,css,md}'",
     "prettier:write": "prettier --write '**/*.{js,css,md}'",
     "preversion": "./scripts/preversion.sh",
-    "version": "./scripts/version.sh",
+    "version": "changes --commits --footer",
     "postversion": "./scripts/postversion.sh"
   },
   "nyc": {