Skip to content

Commit ec9586a

Browse files
authored
Merge branch 'jh-eslint-config-fixes' into cass-gm-1087
2 parents c67b507 + 5006757 commit ec9586a

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.github/workflows/publish.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
git config --global user.email "[email protected]"
3939
git config --global user.name "codecademydev"
4040
git config --global push.default current
41-
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
41+
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_AUTH_TOKEN }}" > .npmrc
4242
4343
- uses: ./.github/actions/yarn
4444

@@ -50,18 +50,18 @@ jobs:
5050
env:
5151
HUSKY_ENABLED: true
5252
GH_TOKEN: ${{ secrets.ACTIONS_GITHUB_TOKEN }}
53-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
54-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
53+
NPM_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
54+
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
5555
run: |
56-
npx lerna publish --yes --canary --dist-tag=alpha.${GITHUB_SHA:0:6} --preid=alpha.${GITHUB_SHA:0:6}
56+
npx lerna publish --loglevel=verbose --yes --canary --dist-tag=alpha.${GITHUB_SHA:0:6} --preid=alpha.${GITHUB_SHA:0:6}
5757
5858
- name: Publish
5959
# Only publish the non-alpha version on main
6060
if: steps.branch-name.outputs.is_default == 'true'
6161
env:
6262
HUSKY_ENABLED: true
6363
GH_TOKEN: ${{ secrets.ACTIONS_GITHUB_TOKEN }}
64-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
65-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
64+
NPM_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
65+
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
6666
run: |
6767
npx lerna publish --yes --exact --conventional-commits --changelog-preset conventionalcommits --include-merged-tags --create-release=github

.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ node_modules
22
**/node_modules
33
**/dist
44
**/tmp
5+
6+
/.nx/workspace-data

lerna.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"version": "independent",
33
"npmClient": "yarn",
4-
"useWorkspaces": true,
54
"packages": ["packages/*"],
65
"command": {
76
"publish": {
@@ -11,5 +10,6 @@
1110
"version": {
1211
"changelogPreset": "conventionalcommits"
1312
}
14-
}
13+
},
14+
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
1515
}

0 commit comments

Comments
 (0)