From b0905c625cf97c3f4428d9dc8f6fbaddb93a30af Mon Sep 17 00:00:00 2001 From: James Munns Date: Sun, 4 Jan 2026 22:55:42 +0100 Subject: [PATCH 1/2] Move old bbqueue to "legacy" --- {bbq2/.github => .github}/workflows/build.yml | 3 ++- .github/workflows/doctests.yml | 26 ------------------- .github/workflows/embedded-builds.yml | 26 ------------------- .github/workflows/fmt.yml | 18 ------------- .github/workflows/full-test.yml | 21 --------------- {bbq2/.github => .github}/workflows/miri.yml | 1 + Cargo.toml | 8 ++++-- {bbqtest => legacy-bbqtest}/Cargo.toml | 2 +- {bbqtest => legacy-bbqtest}/src/benches.rs | 0 {bbqtest => legacy-bbqtest}/src/framed.rs | 0 {bbqtest => legacy-bbqtest}/src/lib.rs | 0 .../src/multi_thread.rs | 0 .../src/ring_around_the_senders.rs | 0 .../src/single_thread.rs | 0 {core => legacy-core}/Cargo.toml | 0 {core => legacy-core}/src/bbbuffer.rs | 0 {core => legacy-core}/src/framed.rs | 0 {core => legacy-core}/src/lib.rs | 0 {core => legacy-core}/src/vusize.rs | 0 19 files changed, 10 insertions(+), 95 deletions(-) rename {bbq2/.github => .github}/workflows/build.yml (96%) delete mode 100644 .github/workflows/doctests.yml delete mode 100644 .github/workflows/embedded-builds.yml delete mode 100644 .github/workflows/fmt.yml delete mode 100644 .github/workflows/full-test.yml rename {bbq2/.github => .github}/workflows/miri.yml (93%) rename {bbqtest => legacy-bbqtest}/Cargo.toml (96%) rename {bbqtest => legacy-bbqtest}/src/benches.rs (100%) rename {bbqtest => legacy-bbqtest}/src/framed.rs (100%) rename {bbqtest => legacy-bbqtest}/src/lib.rs (100%) rename {bbqtest => legacy-bbqtest}/src/multi_thread.rs (100%) rename {bbqtest => legacy-bbqtest}/src/ring_around_the_senders.rs (100%) rename {bbqtest => legacy-bbqtest}/src/single_thread.rs (100%) rename {core => legacy-core}/Cargo.toml (100%) rename {core => legacy-core}/src/bbbuffer.rs (100%) rename {core => legacy-core}/src/framed.rs (100%) rename {core => legacy-core}/src/lib.rs (100%) rename {core => legacy-core}/src/vusize.rs (100%) diff --git a/bbq2/.github/workflows/build.yml b/.github/workflows/build.yml similarity index 96% rename from bbq2/.github/workflows/build.yml rename to .github/workflows/build.yml index 1672629..44e1317 100644 --- a/bbq2/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,9 +8,10 @@ on: workflow_dispatch: jobs: - miri: + build: name: "Build all crates" runs-on: ubuntu-latest + working-directory: ./bbq2 steps: - uses: actions/checkout@v4 - name: Install embedded target diff --git a/.github/workflows/doctests.yml b/.github/workflows/doctests.yml deleted file mode 100644 index 042917f..0000000 --- a/.github/workflows/doctests.yml +++ /dev/null @@ -1,26 +0,0 @@ -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -name: Documentation Tests - -jobs: - build: - runs-on: ubuntu-latest - strategy: - matrix: - include: - - features: thumbv6 - nodefault: "--no-default-features" - - features: "" - nodefault: "" - - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable - - uses: actions-rs/cargo@v1 - with: - command: test - args: ${{ matrix.nodefault }} --features=${{ matrix.features }} --manifest-path core/Cargo.toml diff --git a/.github/workflows/embedded-builds.yml b/.github/workflows/embedded-builds.yml deleted file mode 100644 index 5441661..0000000 --- a/.github/workflows/embedded-builds.yml +++ /dev/null @@ -1,26 +0,0 @@ -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -name: Embedded Builds - -jobs: - build: - runs-on: ubuntu-latest - strategy: - matrix: - include: - - features: "" - target: thumbv7em-none-eabihf - - feature: thumbv6 - target: thumbv6m-none-eabi - - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable - with: - targets: thumbv6m-none-eabi, thumbv7em-none-eabihf - - - run: cargo build --manifest-path core/Cargo.toml --no-default-features --features=${{ matrix.feature }} --target=${{ matrix.target }} diff --git a/.github/workflows/fmt.yml b/.github/workflows/fmt.yml deleted file mode 100644 index 9f7c138..0000000 --- a/.github/workflows/fmt.yml +++ /dev/null @@ -1,18 +0,0 @@ -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -name: Formatting check - -jobs: - fmt: - name: Rustfmt - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable - with: - components: rustfmt - - run: cargo fmt --all -- --check diff --git a/.github/workflows/full-test.yml b/.github/workflows/full-test.yml deleted file mode 100644 index 683ef22..0000000 --- a/.github/workflows/full-test.yml +++ /dev/null @@ -1,21 +0,0 @@ -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -name: Integration Tests - -jobs: - build: - runs-on: ubuntu-latest - strategy: - matrix: - include: - - build: "" - - build: "--release" - - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable - - run: cargo test ${{ matrix.build }} --features=short-potato --manifest-path bbqtest/Cargo.toml -- --nocapture diff --git a/bbq2/.github/workflows/miri.yml b/.github/workflows/miri.yml similarity index 93% rename from bbq2/.github/workflows/miri.yml rename to .github/workflows/miri.yml index d8ae0e3..8bd435f 100644 --- a/bbq2/.github/workflows/miri.yml +++ b/.github/workflows/miri.yml @@ -11,6 +11,7 @@ jobs: miri: name: "miri all the things" runs-on: ubuntu-latest + working-directory: ./bbq2 steps: - uses: actions/checkout@v4 - name: Install miri component diff --git a/Cargo.toml b/Cargo.toml index f5deb65..6f72169 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,7 @@ [workspace] -members = ["bbqtest", "core"] -exclude = ["bbq2"] +resolver = "3" +members = [ + "bbq2", + "legacy-bbqtest", + "legacy-core", +] diff --git a/bbqtest/Cargo.toml b/legacy-bbqtest/Cargo.toml similarity index 96% rename from bbqtest/Cargo.toml rename to legacy-bbqtest/Cargo.toml index 3e9a930..b219766 100644 --- a/bbqtest/Cargo.toml +++ b/legacy-bbqtest/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0" bounded-spsc-queue = { version = "0.4.0", optional = true } [dependencies.bbqueue] -path = "../core" +path = "../legacy-core" [dev-dependencies] diff --git a/bbqtest/src/benches.rs b/legacy-bbqtest/src/benches.rs similarity index 100% rename from bbqtest/src/benches.rs rename to legacy-bbqtest/src/benches.rs diff --git a/bbqtest/src/framed.rs b/legacy-bbqtest/src/framed.rs similarity index 100% rename from bbqtest/src/framed.rs rename to legacy-bbqtest/src/framed.rs diff --git a/bbqtest/src/lib.rs b/legacy-bbqtest/src/lib.rs similarity index 100% rename from bbqtest/src/lib.rs rename to legacy-bbqtest/src/lib.rs diff --git a/bbqtest/src/multi_thread.rs b/legacy-bbqtest/src/multi_thread.rs similarity index 100% rename from bbqtest/src/multi_thread.rs rename to legacy-bbqtest/src/multi_thread.rs diff --git a/bbqtest/src/ring_around_the_senders.rs b/legacy-bbqtest/src/ring_around_the_senders.rs similarity index 100% rename from bbqtest/src/ring_around_the_senders.rs rename to legacy-bbqtest/src/ring_around_the_senders.rs diff --git a/bbqtest/src/single_thread.rs b/legacy-bbqtest/src/single_thread.rs similarity index 100% rename from bbqtest/src/single_thread.rs rename to legacy-bbqtest/src/single_thread.rs diff --git a/core/Cargo.toml b/legacy-core/Cargo.toml similarity index 100% rename from core/Cargo.toml rename to legacy-core/Cargo.toml diff --git a/core/src/bbbuffer.rs b/legacy-core/src/bbbuffer.rs similarity index 100% rename from core/src/bbbuffer.rs rename to legacy-core/src/bbbuffer.rs diff --git a/core/src/framed.rs b/legacy-core/src/framed.rs similarity index 100% rename from core/src/framed.rs rename to legacy-core/src/framed.rs diff --git a/core/src/lib.rs b/legacy-core/src/lib.rs similarity index 100% rename from core/src/lib.rs rename to legacy-core/src/lib.rs diff --git a/core/src/vusize.rs b/legacy-core/src/vusize.rs similarity index 100% rename from core/src/vusize.rs rename to legacy-core/src/vusize.rs From e73a2b143cc97f22cd74ef96c39fec4f2b1b3dff Mon Sep 17 00:00:00 2001 From: James Munns Date: Sun, 4 Jan 2026 22:58:34 +0100 Subject: [PATCH 2/2] gha syntax --- .github/workflows/build.yml | 5 ++++- .github/workflows/miri.yml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 44e1317..4bff01d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,11 +7,14 @@ on: branches: ["main"] workflow_dispatch: +defaults: + run: + working-directory: ./bbq2 + jobs: build: name: "Build all crates" runs-on: ubuntu-latest - working-directory: ./bbq2 steps: - uses: actions/checkout@v4 - name: Install embedded target diff --git a/.github/workflows/miri.yml b/.github/workflows/miri.yml index 8bd435f..90debb3 100644 --- a/.github/workflows/miri.yml +++ b/.github/workflows/miri.yml @@ -7,11 +7,14 @@ on: branches: ["main"] workflow_dispatch: +defaults: + run: + working-directory: ./bbq2 + jobs: miri: name: "miri all the things" runs-on: ubuntu-latest - working-directory: ./bbq2 steps: - uses: actions/checkout@v4 - name: Install miri component