File tree 8 files changed +4252
-3632
lines changed
8 files changed +4252
-3632
lines changed Original file line number Diff line number Diff line change 38
38
git fetch --unshallow
39
39
git checkout development
40
40
git pull
41
- git merge --no-ff origin/${{ inputs.main_branch }} -m "Back-merge ${{ inputs.main_branch }} into development"
41
+ git merge --no-ff origin/${{ inputs.main_branch }} -m "🔀 Back-merge ${{ inputs.main_branch }} into development"
42
42
git push
Original file line number Diff line number Diff line change @@ -15,44 +15,21 @@ runs:
15
15
using : " composite"
16
16
17
17
steps :
18
- - name : Install Node.js ${{ matrix.node-version }}
19
- uses : actions/setup-node@v3
20
- with :
21
- node-version : ${{ matrix.node-version }}
22
-
23
18
- name : Install pnpm
24
- uses : pnpm/action-setup@v2
19
+ uses : pnpm/action-setup@v3
25
20
id : pnpm-install
26
21
with :
27
22
version : 9
28
23
run_install : false
29
24
30
- - name : Set pnpm home
31
- shell : bash
32
- run : |
33
- echo "PNPM_HOME=$HOME/.local/share/pnpm" >> $GITHUB_ENV
34
- echo "$HOME/.local/share/pnpm" >> $GITHUB_PATH
35
-
36
- - name : Get pnpm store directory
37
- id : pnpm-cache
38
- shell : bash
39
- run : |
40
- echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_OUTPUT
41
-
42
- - name : Setup pnpm cache
43
- uses : actions/cache@v3
25
+ - name : Install Node.js ${{ matrix.node-version }}
26
+ uses : actions/setup-node@v4
44
27
with :
45
- path : ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
46
- key : ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
47
- restore-keys : |
48
- ${{ runner.os }}-pnpm-store-
49
-
50
- - name : Authenticate for private NPM package
51
- shell : bash
28
+ node-version : ${{ matrix.node-version }}
29
+ cache : pnpm
30
+ registry-url : ' https://registry.npmjs.org'
52
31
env :
53
- NPM_TOKEN : ${{ inputs.npm_token }}
54
- run : |
55
- echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
32
+ NODE_AUTH_TOKEN : ${{ inputs.npm_token }}
56
33
57
34
- name : Install dependencies
58
35
shell : bash
Original file line number Diff line number Diff line change 9
9
"lint" : " next lint"
10
10
},
11
11
"dependencies" : {
12
- "@types/node" : " 20.11.30 " ,
13
- "@types/react" : " 18.2.67 " ,
14
- "@types/react-dom" : " 18.2.22 " ,
12
+ "@types/node" : " 20.12.12 " ,
13
+ "@types/react" : " 18.3.2 " ,
14
+ "@types/react-dom" : " 18.3.0 " ,
15
15
"eslint" : " 8.57.0" ,
16
- "eslint-config-next" : " 14.1.4 " ,
17
- "next" : " 14.1.4 " ,
16
+ "eslint-config-next" : " 14.2.3 " ,
17
+ "next" : " 14.2.3 " ,
18
18
"next-runtime-env" : " link:../.." ,
19
- "react" : " 18.2.0 " ,
20
- "react-dom" : " 18.2.0 " ,
21
- "typescript" : " 5.4.3 "
19
+ "react" : " 18.3.1 " ,
20
+ "react-dom" : " 18.3.1 " ,
21
+ "typescript" : " 5.4.5 "
22
22
}
23
23
}
You can’t perform that action at this time.
0 commit comments