Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI for MacOS #1

Merged
merged 7 commits into from
Apr 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: CI

on:
pull_request:
push:
branches:
- main
release:
types:
- released
Expand All @@ -16,15 +19,15 @@ jobs:
submodules: recursive
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
targets: aarch64-apple-darwin
- name: Build
run: cargo build
- name: Tests
- name: Test
run: cargo test

windows:
runs-on: windows-latest
# TODO: https://github.com/rust-lang/rust-bindgen/issues/2179
continue-on-error: true
steps:
- uses: actions/checkout@v3
with:
Expand All @@ -33,7 +36,7 @@ jobs:
uses: dtolnay/rust-toolchain@stable
- name: Build
run: cargo build
- name: Tests
- name: Test
run: cargo test

linux:
Expand All @@ -46,5 +49,5 @@ jobs:
uses: dtolnay/rust-toolchain@stable
- name: Build
run: cargo build
- name: Tests
- name: Test
run: cargo test
3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ name = "blosc2-rs"
version = "0.1.0"
edition = "2021"

[lib]
name = "blosc2"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
Expand Down
1 change: 1 addition & 0 deletions blosc2-sys/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use std::path::PathBuf;
fn main() {
let lib = cmake::Config::new("c-blosc2")
.define("CMAKE_POSITION_INDEPENDENT_CODE", "ON")
.define("CMAKE_C_FLAGS", "-fPIE")
.define("BLOSC_INSTALL", "ON")
.define("BUILD_TESTS", "OFF")
.define("BUILD_EXAMPLES", "OFF")
Expand Down
6 changes: 3 additions & 3 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ impl Default for CLevel {
// }

pub mod read {
/// NOTE: These De/compressors are different from the blosc2 schunk. There are no frames, meta
/// layers, etc. It's _only_ meant for one or more independently compressed blocks. No more, no
/// less. If you're wanting `schunk` then hop over to the `crate::schunk` module(s).
///! NOTE: These De/compressors are different from the blosc2 schunk. There are no frames, meta
///! layers, etc. It's _only_ meant for one or more independently compressed blocks. No more, no
///! less. If you're wanting `schunk` then hop over to the `crate::schunk` module(s).
use super::*;

pub struct Decompressor<R: std::io::Read> {
Expand Down