From aaba571f82cfea1343f56bd48bdfb460a3e1cef5 Mon Sep 17 00:00:00 2001 From: Franco Victorio Date: Mon, 19 Feb 2024 14:25:31 +0100 Subject: [PATCH] Remove edr/main mentions --- .github/workflows/edr-npm-release.yml | 1 - .github/workflows/hardhat-core-ci.yml | 3 +-- book/src/03_release.md | 2 +- book/src/99_contributing.md | 2 +- crates/README.md | 4 ---- 5 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/edr-npm-release.yml b/.github/workflows/edr-npm-release.yml index 3297b30df1..697094dba8 100644 --- a/.github/workflows/edr-npm-release.yml +++ b/.github/workflows/edr-npm-release.yml @@ -10,7 +10,6 @@ permissions: push: branches: - main - - edr/main tags-ignore: - "**" paths-ignore: diff --git a/.github/workflows/hardhat-core-ci.yml b/.github/workflows/hardhat-core-ci.yml index 8d97abece2..17645cdb0a 100644 --- a/.github/workflows/hardhat-core-ci.yml +++ b/.github/workflows/hardhat-core-ci.yml @@ -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" diff --git a/book/src/03_release.md b/book/src/03_release.md index 2fb70d9c46..258cea83a0 100644 --- a/book/src/03_release.md +++ b/book/src/03_release.md @@ -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. diff --git a/book/src/99_contributing.md b/book/src/99_contributing.md index 3e93fa3689..cf8dc7e8a1 100644 --- a/book/src/99_contributing.md +++ b/book/src/99_contributing.md @@ -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. diff --git a/crates/README.md b/crates/README.md index b7b57f2a6e..a6517c32d5 100644 --- a/crates/README.md +++ b/crates/README.md @@ -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.