Skip to content

Commit

Permalink
Remove Bevy main tracking branch (#253)
Browse files Browse the repository at this point in the history
* Remove `ci-cron.yml`

* Update `actions/checkout` from `v3` to `v4`

* Remove references to `bevy_main` branches
  • Loading branch information
Nilirad authored Aug 19, 2024
1 parent fcd8712 commit 8bb85b3
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 71 deletions.
45 changes: 0 additions & 45 deletions .github/workflows/ci-cron.yml

This file was deleted.

6 changes: 3 additions & 3 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 All @@ -18,7 +18,7 @@ jobs:
os: [windows-latest, ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: dtolnay/rust-toolchain@master
with:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
check-advisories:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: bevy-main
ref: master
- uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
Expand All @@ -38,9 +38,9 @@ jobs:
check-bans:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: bevy-main
ref: master
- uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
Expand All @@ -52,9 +52,9 @@ jobs:
check-licenses:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: bevy-main
ref: master
- uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
Expand All @@ -66,9 +66,9 @@ jobs:
check-sources:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- 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 8bb85b3

Please sign in to comment.