Update packs after v0.15 release. Change pre and post releases shells

askirmas · Mar 11, 2021 · dc57ad5 · dc57ad5
1 parent 7dddd78
commit dc57ad5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/__recipes__/package-lock.json b/__recipes__/package-lock.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
   },
   "devDependencies": {
     "@types/classnames": "^2.2.11",
-    "@types/node": "^14.14.25",
+    "@types/node": "^14.14.33",
     "@types/react": "^17.0.1",
     "@types/react-dom": "^17.0.1",
     "@types/reactstrap": "^8.7.2",

diff --git a/postrelease.sh b/postrelease.sh
@@ -5,5 +5,6 @@ git switch main
 # Change strategy to not mesh history
 git merge -X theirs -nm "Backmerge after v$v release" release
 npm update; npm update --save-dev
+git add .
 git commit -m "Updater after v$v release"
 exit $?
diff --git a/prerelease.sh b/prerelease.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 git switch release && \
-git merge --squash --no-edit --log --no-stat main && \
+git merge -X theirs -n release
 git commit --no-edit
 exit $?