diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml index a1742c81..4980e143 100644 --- a/.github/actions/setup-rust/action.yml +++ b/.github/actions/setup-rust/action.yml @@ -21,4 +21,8 @@ runs: toolchain: ${{ inputs.toolchain }} targets: ${{ inputs.targets }} components: ${{ inputs.components }} + - name: Add Targets + if: ${{ inputs.targets }} + run: rustup target add ${{ inputs.targets }} + shell: bash - uses: Swatinem/rust-cache@v2 diff --git a/.github/workflows/jwst.yml b/.github/workflows/jwst.yml index d68e9a43..66504fe8 100644 --- a/.github/workflows/jwst.yml +++ b/.github/workflows/jwst.yml @@ -388,10 +388,10 @@ jobs: CARGO_TERM_COLOR: always steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@stable + - name: Setup Rust + uses: ./.github/actions/setup-rust with: components: llvm-tools-preview - - uses: Swatinem/rust-cache@v2 - name: Install latest nextest release uses: taiki-e/install-action@nextest @@ -416,8 +416,8 @@ jobs: CARGO_TERM_COLOR: always steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@stable - - uses: Swatinem/rust-cache@v2 + - name: Setup Rust + uses: ./.github/actions/setup-rust - name: Install latest nextest release uses: taiki-e/install-action@nextest @@ -435,10 +435,10 @@ jobs: CARGO_TERM_COLOR: always steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@master + - name: Setup Rust + uses: ./.github/actions/setup-rust with: - toolchain: nightly-2023-05-23 - - uses: Swatinem/rust-cache@v2 + toolchain: nightly-2023-08-19 - name: fuzzing working-directory: ./libs/jwst-codec-utils diff --git a/libs/jwst-codec-utils/fuzz/fuzz_targets/apply_update.rs b/libs/jwst-codec-utils/fuzz/fuzz_targets/apply_update.rs index f673c7a9..0791f74b 100644 --- a/libs/jwst-codec-utils/fuzz/fuzz_targets/apply_update.rs +++ b/libs/jwst-codec-utils/fuzz/fuzz_targets/apply_update.rs @@ -43,7 +43,7 @@ fuzz_target!(|crdt_params: Vec| { let trx = doc.transact_mut(); let binary_from_yrs = trx.encode_update_v1().unwrap(); - let doc = jwst_codec::Doc::new_from_binary(binary_from_yrs).unwrap(); + let doc = jwst_codec::Doc::try_from_binary_v1(&binary_from_yrs).unwrap(); let binary = doc.encode_update_v1().unwrap(); assert_eq!(binary, binary_from_yrs); }); diff --git a/libs/jwst-storage/src/entities/prelude.rs b/libs/jwst-storage/src/entities/prelude.rs index f5578d70..af39fb91 100644 --- a/libs/jwst-storage/src/entities/prelude.rs +++ b/libs/jwst-storage/src/entities/prelude.rs @@ -1,6 +1,7 @@ //! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.6 -pub use super::blobs::Entity as Blobs; +#[cfg(feature = "bucket")] pub use super::bucket_blobs::Entity as BucketBlobs; -pub use super::docs::Entity as Docs; +#[cfg(feature = "image")] pub use super::optimized_blobs::Entity as OptimizedBlobs; +pub use super::{blobs::Entity as Blobs, docs::Entity as Docs};