Skip to content

Commit 977c6b0

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

File tree

1 file changed

+0
-18
lines changed

1 file changed

+0
-18
lines changed

.github/workflows/ci.yaml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,6 @@ 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)
9282
- name: Publish
9383
id: publish
9484
env:
@@ -98,15 +88,7 @@ jobs:
9888
npm config set //registry.npmjs.org/:_authToken $NPM_TOKEN
9989
10090
if [ ${{ inputs.release-type }} == 'alpha' ]; then
101-
<<<<<<< HEAD
102-
pnpm release -- --preRelease=alpha
103-
else
104-
pnpm release -- -i=${{ inputs.release-type }}
105-
fi
106-
=======
10791
pnpm release --preRelease=alpha
10892
else
10993
pnpm release -i=${{ inputs.release-type }}
11094
fi
111-
>>>>>>> Stashed changes
112-
>>>>>>> f80efb6 (chore: move from npm back to pnpm)

0 commit comments

Comments
 (0)