Skip to content

Commit de1e1c7

Browse files
committed
💚 renovate on dev, reset-dev with hash
1 parent d49049a commit de1e1c7

File tree

6 files changed

+23
-18
lines changed

6 files changed

+23
-18
lines changed

.github/renovate.json5

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
// https://github.com/nuxt/renovate-config-nuxt/blob/main/default.json
77
"github>nuxt/renovate-config-nuxt"
88
],
9+
"branchPrefix": "renovate/dev-",
10+
"baseBranches": ["develop"],
911
"lockFileMaintenance": {
1012
"enabled": false
1113
},

.github/reset-dev.sh

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
11
#!/bin/bash -e
2+
if [ -z "$1" ]; then
3+
git pull
4+
#git --no-pager tag | tac | head -n 5
5+
git --no-pager tag | tail -n 5
6+
echo -e "\033[37;42;1mWhich tag to show from?\033[0m"
7+
read _tag
28

3-
git pull
4-
#git --no-pager tag | tac | head -n 5
5-
git --no-pager tag | tail -n 5
6-
echo -e "\033[37;42;1mWhich tag to show from?\033[0m"
7-
read _tag
8-
9-
git --no-pager log --oneline --graph --all $_tag..HEAD
10-
echo -e "\033[37;42;1mWhich commit to reset to?\033[0m"
11-
read _hash
12-
if [ -z "$_hash" ]; then
13-
_hash=$(git rev-parse --short HEAD^1)
14-
echo "use HEAD^1 by default $_hash"
9+
git --no-pager log --oneline --graph --all $_tag..HEAD
10+
echo -e "\033[37;42;1mWhich commit to reset to?\033[0m"
11+
read _hash
12+
if [ -z "$_hash" ]; then
13+
_hash=$(git rev-parse --short HEAD^1)
14+
echo "use HEAD^1 by default $_hash"
15+
fi
16+
else
17+
_hash="$1"
18+
git --no-pager show --name-only $_hash
1519
fi
1620

21+
echo -e "\033[37;42;1mMixed reset to $_hash, exclude package.json\033[0m"
1722
read -p "Any key to continue, Ctrl+C to cancel"
1823

19-
echo "Mixed reset to $_hash, exclude package.json"
20-
2124
git stash
2225
git reset --mixed $_hash
2326
git add 'package.json' '**package.json'

layers/common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@fessional/razor-common",
3-
"version": "0.8.1-dev.8",
3+
"version": "0.8.1-dev.9",
44
"description": "common layer for mobile and desktop",
55
"type": "module",
66
"main": "./nuxt.config.ts",

layers/desktop/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@fessional/razor-desktop",
3-
"version": "0.8.1-dev.8",
3+
"version": "0.8.1-dev.9",
44
"description": "desktop layer with vuetify",
55
"type": "module",
66
"main": "./nuxt.config.ts",

layers/mobile/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@fessional/razor-mobile",
3-
"version": "0.8.1-dev.8",
3+
"version": "0.8.1-dev.9",
44
"description": "mobile layer with ionic and capacitor",
55
"type": "module",
66
"main": "./nuxt.config.ts",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@fessional/razor",
3-
"version": "0.8.1-dev.8",
3+
"version": "0.8.1-dev.9",
44
"description": "Use front-end tech (Nuxt/Ts) to build multi-platform from one codebase, suitable for small team and app to write app once, apply almost anywhere.",
55
"type": "module",
66
"files": [

0 commit comments

Comments
 (0)