Skip to content

Commit

Permalink
Remove references to bevy_main branches
Browse files Browse the repository at this point in the history
  • Loading branch information
Nilirad committed Aug 19, 2024
1 parent 45b3a2b commit 4ac5e34
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: CI

on:
pull_request:
branches: [master, bevy-main]
branches: [master]
push:
branches: [master, bevy-main]
branches: [master]

env:
CARGO_TERM_COLOR: always
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
ref: bevy-main
ref: master
- uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
Expand All @@ -40,7 +40,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
ref: bevy-main
ref: master
- uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
Expand All @@ -54,7 +54,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
ref: bevy-main
ref: master
- uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
Expand All @@ -68,7 +68,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
ref: bevy-main
ref: master
- uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
Expand Down
15 changes: 0 additions & 15 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,6 @@ when contributing to `bevy_prototype_lyon`:
of the changes you have made
and why they are necessary.

### Branches

We maintain two long term branches,
each with their characteristics.

- `master`.
Tracks the latest Bevy release.
You should target this branch by default.
- `bevy-main`.
Tracks the `main` branch of `bevy`.
You should target this branch
only if you have to accommodate a breaking change caused by Bevy,
or if you want to develop a feature
not yet supported by the latest release.

## Reporting Issues

If you encounter any issues,
Expand Down

0 comments on commit 4ac5e34

Please sign in to comment.