diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 7e05fed..3204432 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -117,29 +117,28 @@ jobs: strategy: matrix: target: - - intel-catalina - - intel-bigsur - - m1-bigsur + - intel-monterey + - intel-ventura + - silicon-sonoma include: - - target: intel-catalina - os: macOS-10.15 + - target: intel-monterey + os: macOS-12.0 toolchain_target: x86_64-apple-darwin toolchain: stable - aux_args: "" - default: false - - target: intel-bigsur - os: macOS-11.0 + aux_args: --target x86_64-apple-darwin + default: true + - target: intel-ventura + os: macOS-13.0 toolchain_target: x86_64-apple-darwin toolchain: stable + aux_args: --target x86_64-apple-darwin + default: true + - target: silicon-sonoma + os: macOS-14.0 + toolchain_target: aarch64-apple-darwin + toolchain: stable aux_args: "" default: false - # TODO enable again and try to find out why this fails - # - target: m1-bigsur - # os: macOS-11.0 - # toolchain_target: aarch64-apple-darwin - # toolchain: nightly - # aux_args: --target aarch64-apple-darwin - # default: true steps: - name: Checkout repository @@ -150,19 +149,14 @@ jobs: - name: Install stable toolchain uses: actions-rs/toolchain@v1.0.6 with: - toolchain: stable + toolchain: ${{ matrix.toolchain }} + target: ${{ matrix.toolchain_target }} override: true + default: ${{ matrix.default }} - name: Install htslib dependencies run: brew install bzip2 zlib xz curl-openssl - #- uses: actions-rs/toolchain@v1.0.6 - # with: - # toolchain: ${{ matrix.toolchain }} - # target: ${{ matrix.toolchain_target }} - # #override: true - # default: ${{ matrix.default }} - - name: Test uses: actions-rs/cargo@v1.0.1 with: diff --git a/Cargo.toml b/Cargo.toml index eeafb31..f625ce6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,6 +38,6 @@ static = [] # Don't dynamically link to other libraries [build-dependencies] fs-utils = "1.1" -bindgen = { version = "0.53.2", default-features = false, features = ["runtime"], optional = true } +bindgen = { version = "0.69.4", default-features = false, features = ["runtime"], optional = true } cc = { version = "1.0", features = ["parallel"] } glob = "0.3.0" diff --git a/build.rs b/build.rs index a391cd7..ab076ab 100644 --- a/build.rs +++ b/build.rs @@ -268,8 +268,8 @@ fn main() { bindgen::Builder::default() .header("wrapper.h") .generate_comments(false) - .blacklist_function("strtold") - .blacklist_type("max_align_t") + .blocklist_function("strtold") + .blocklist_type("max_align_t") .generate() .expect("Unable to generate bindings.") .write_to_file(out.join("bindings.rs"))