Skip to content

Commit 7ce0a3b

Browse files
committed
merge changes
2 parents d55925c + 13c1e1e commit 7ce0a3b

File tree

7 files changed

+145
-1172
lines changed

7 files changed

+145
-1172
lines changed

.github/actions/yarn/action.yml

100644100755
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ runs:
88
uses: actions/setup-node@v4
99
with:
1010
node-version-file: .nvmrc
11+
registry-url: 'https://registry.npmjs.org'
1112
- uses: actions/cache@v4
1213
with:
1314
path: |

.github/workflows/publish.yml

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,39 @@ jobs:
2929
fetch-depth: 0
3030
token: ${{ secrets.ACTIONS_GITHUB_TOKEN }}
3131

32+
- name: Get branch name
33+
id: branch-name
34+
uses: tj-actions/branch-names@v8
35+
3236
- name: Set git user
3337
run: |
3438
git config --global user.email "[email protected]"
3539
git config --global user.name "codecademydev"
3640
git config --global push.default current
41+
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
3742
3843
- uses: ./.github/actions/yarn
3944

4045
- run: yarn turbo run build --concurrency=3
4146

42-
- name: Publish
47+
- name: Publish Alpha
48+
# Only publish alpha on non-main branches
49+
if: steps.branch-name.outputs.is_default != 'true'
4350
env:
4451
HUSKY_ENABLED: true
4552
GH_TOKEN: ${{ secrets.ACTIONS_GITHUB_TOKEN }}
4653
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
47-
run: npx auto shipit
54+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
55+
run: |
56+
npx lerna publish --yes --canary --dist-tag=alpha.${GITHUB_SHA:0:6} --preid=alpha.${GITHUB_SHA:0:6}
4857
49-
publish-check:
50-
runs-on: ubuntu-22.04
51-
steps:
52-
- uses: actions/checkout@v4
53-
- uses: ./.github/actions/yarn
54-
- run: npx auto pr-check --url "https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}?pr=${{github.event.pull_request.number}}"
58+
- name: Publish
59+
# Only publish the non-alpha version on main
60+
if: steps.branch-name.outputs.is_default == 'true'
5561
env:
56-
GH_TOKEN: ${{ secrets.ACTIONS_GITHUB_TOKEN || github.token }}
62+
HUSKY_ENABLED: true
63+
GH_TOKEN: ${{ secrets.ACTIONS_GITHUB_TOKEN }}
5764
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
65+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
66+
run: |
67+
npx lerna publish --yes --exact --conventional-commits --changelog-preset conventionalcommits --include-merged-tags --create-release=github

README.md

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -64,35 +64,6 @@ The config for Turborepo is located at [/turbo.json](/turbo.json).
6464

6565
To use Turborepo without extra configuration, if your package needs to be compiled, it should have a task called `build` that compiles it's files and puts them into a directory called `dist` inside the package directory. If you need a more complicated setup, you can read the docs and customize the configuration in `turbo.json`.
6666

67-
**Release Labels**
68-
69-
These labels will mark your PR as ready for release. They will trigger a release of the package(s) you changed once your PR is merged.
70-
71-
- **release/major**: Increments the major version number of the package(s) you changed
72-
- **release/minor**: Increments the minor version number of the package(s) you changed
73-
- **release/patch**: Increments the patch version number of the package(s) you changed
74-
- **release/performance**: Increments the patch version number of the package(s) you changed
75-
76-
These labels will not create a release by default, but will if combined with one of the above labels:
77-
78-
- **release/dependencies**: Changes to dependencies
79-
- **release/internal**: Changes to internal code
80-
- **release/tests**: Changes to tests
81-
82-
The skip label will prevent a release from being created. You can merge multiple PRs with this label, and then merge a PR without it to create a release from all of them at once.
83-
84-
- **release/skip**: Skips the release process for the package(s) you changed
85-
86-
**Scope**
87-
88-
A scope is optional and consists of a noun describing a section of the codebase surrounded by parenthesis, e.g., feat(Button):
89-
90-
**Breaking Changes**
91-
92-
Using the **release/major** label will bump the major version number of the package(s) you changed, which indicates that your changes are not backwards compatible with previous versions of the package(s).
93-
94-
This will indicate to package consumers that they need to refactor their usage of the module to upgrade.
95-
9667
#### Breaking Changes Release Process
9768

9869
Because client-modules is a separate repository from its consumers, it can be tricky to coordinate technically breaking changes.

auto.config.js

Lines changed: 0 additions & 98 deletions
This file was deleted.

package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@
4848
"lerna": "3.22.1"
4949
},
5050
"devDependencies": {
51-
"auto": "^11.1.6",
52-
"@auto-it/all-contributors": "^11.0.4",
53-
"@auto-it/first-time-contributor": "^11.0.4",
54-
"@auto-it/npm": "^11.0.4",
55-
"@auto-it/released": "^11.0.4",
5651
"@babel/cli": "7.13.10",
5752
"@babel/core": "7.19.6",
5853
"@babel/preset-typescript": "^7.13.0",

packages/eslint-config/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
"eslint": "^8.11.0"
2424
},
2525
"dependencies": {
26-
"@typescript-eslint/eslint-plugin": "^8.31.1",
27-
"@typescript-eslint/parser": "^8.31.1",
26+
"@typescript-eslint/eslint-plugin": "^8.31.0",
27+
"@typescript-eslint/parser": "^8.31.0",
2828
"eslint-config-prettier": "^10.1.2",
2929
"eslint-mdx": "^3.4.1",
3030
"eslint-plugin-import": "^2.31.0",

0 commit comments

Comments
 (0)