Skip to content

Commit 5c0558c

Browse files
author
Berend Sliedrecht
committed
chore: move from npm back to pnpm
Signed-off-by: Berend Sliedrecht <[email protected]>
1 parent 6febf6c commit 5c0558c

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

.github/workflows/ci.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,16 @@ jobs:
7979
git config user.name "Animo Solutions"
8080
git config user.email "[email protected]"
8181
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)
8292
- name: Publish
8393
id: publish
8494
env:
@@ -88,7 +98,15 @@ jobs:
8898
npm config set //registry.npmjs.org/:_authToken $NPM_TOKEN
8999
90100
if [ ${{ inputs.release-type }} == 'alpha' ]; then
101+
<<<<<<< HEAD
91102
pnpm release -- --preRelease=alpha
92103
else
93104
pnpm release -- -i=${{ inputs.release-type }}
94105
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)

0 commit comments

Comments
 (0)