Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove edr/main mentions #4885

Merged
merged 2 commits into from
Feb 19, 2024
Merged

Remove edr/main mentions #4885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aaba571
Remove edr/main mentions
fvictorio Feb 19, 2024
ff7f540
Merge branch 'main' into remove-edr-main-mentions
agostbiro Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/edr-npm-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ permissions:
push:
branches:
- main
- edr/main
tags-ignore:
- "**"
paths-ignore:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/hardhat-core-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name: hardhat-core CI
on:
push:
branches:
- $default-branch
- "edr/main"
- main
paths:
- ".github/workflows/hardhat-core-ci.yml"
- "rust-toolchain"
Expand Down
2 changes: 1 addition & 1 deletion book/src/03_release.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

Releasing the [EDR NPM package](../../crates/edr_napi/package.json) is handled by the [EDR NPM release](../../.github/workflows/edr-npm-release.yml) GitHub Action workflow.

A new release is created automatically on commits to the `main` and `edr/main` branches that follow the following format: `edr-0.1.0` for releases or `edr-0.1.0-alpha.1` for pre-releases.
A new release is created automatically on commits to the `main` branch that follow the following format: `edr-0.1.0` for releases or `edr-0.1.0-alpha.1` for pre-releases.

Prior to making such a commit, the version number in the [package.json](../../crates/edr_napi/package.json) of the main package and the platform-specific packages in the [npm](../../crates/edr_napi/npm) directory need to be manually adjusted.
2 changes: 1 addition & 1 deletion book/src/99_contributing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ We follow the [Conventional Commits](https://www.conventionalcommits.org) conven

## Pull Requests

When merging a pull request to `edr/main`, we employ the "squash and merge" strategy.
When merging a pull request, we employ the "squash and merge" strategy.
By default, the generated commit header will reuse the pull request's title.
To this end, make sure to use the Conventional Commits convention for the pull request title as well.

Expand Down
4 changes: 0 additions & 4 deletions crates/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,3 @@ Use `pnpm` to build a release version:
cd crates/edr_napi
pnpm build
```

## Contributing

EDR is still under development by [Nomic Foundation](https://github.com/NomicFoundation/). As such, progress is being merged with the `edr/main` branch until its first release.