diff --git a/.github/workflows/ci-cron.yml b/.github/workflows/ci-cron.yml deleted file mode 100644 index 53b5ea4..0000000 --- a/.github/workflows/ci-cron.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: CI-cron - -on: - schedule: - - cron: 0 9 * * * - -env: - CARGO_TERM_COLOR: always - -jobs: - - build: - strategy: - matrix: - toolchain: [stable, nightly] - os: [windows-latest, ubuntu-latest] - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v3 - with: - ref: bevy-main - - - uses: dtolnay/rust-toolchain@master - with: - toolchain: ${{ matrix.toolchain }} - components: rustfmt, clippy - - name: fmt - if: ${{ matrix.toolchain == 'nightly' && runner.os == 'linux' }} - run: cargo fmt --all -- --check - - - name: Install alsa and udev - run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev - if: runner.os == 'linux' - - - name: lint - uses: actions-rs/clippy-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - args: --all-targets --all-features -- -D warnings -A unknown-lints - - - name: Build & run tests - run: cargo test --workspace - env: - CARGO_INCREMENTAL: 0 - RUSTFLAGS: "-C debuginfo=0 -D warnings" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c31168b..7d37d46 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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: diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index e144809..2f95c54 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 92c1305..ffbf7d3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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,