File tree Expand file tree Collapse file tree 1 file changed +18
-0
lines changed Expand file tree Collapse file tree 1 file changed +18
-0
lines changed Original file line number Diff line number Diff line change 79
79
git config user.name "Animo Solutions"
80
80
git config user.email "[email protected] "
81
81
82
+ <<<<<<< HEAD
83
+ =======
84
+ <<<<<<< Updated upstream
85
+ if [ ${{ inputs.release-type }} == 'alpha' ]; then
86
+ npm run release -- --preRelease=alpha
87
+ else
88
+ npm run release -- -i=${{ inputs.release-type }}
89
+ fi
90
+ =======
91
+ >>>>>>> f80efb6 (chore: move from npm back to pnpm)
82
92
- name : Publish
83
93
id : publish
84
94
env :
88
98
npm config set //registry.npmjs.org/:_authToken $NPM_TOKEN
89
99
90
100
if [ ${{ inputs.release-type }} == 'alpha' ]; then
101
+ <<<<<<< HEAD
91
102
pnpm release -- --preRelease=alpha
92
103
else
93
104
pnpm release -- -i=${{ inputs.release-type }}
94
105
fi
106
+ =======
107
+ pnpm release --preRelease=alpha
108
+ else
109
+ pnpm release -i=${{ inputs.release-type }}
110
+ fi
111
+ >>>>>>> Stashed changes
112
+ >>>>>>> f80efb6 (chore: move from npm back to pnpm)
You can’t perform that action at this time.
0 commit comments