From bfee11aa5cc6cc575d741843f3957cc3ec45b892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20M=C3=B6lder?= Date: Mon, 6 May 2024 10:49:31 +0200 Subject: [PATCH 01/13] change targets --- .github/workflows/rust.yml | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 7e05fed..b1f1ece 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 + - target: intel-ventura + os: macOS-13.0 toolchain_target: x86_64-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 + - target: silicon-sonoma + os: macOS-14.0 + toolchain_target: aarch64-apple-darwin + toolchain: stable + aux_args: --target aarch64-apple-darwin + default: true steps: - name: Checkout repository From e50c2a3c3b782afdd0db330311eb040a547857b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20M=C3=B6lder?= Date: Mon, 6 May 2024 10:52:44 +0200 Subject: [PATCH 02/13] update bindgen --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From fdca852f2dcfd013084c1a5d4a576141e786ed7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20M=C3=B6lder?= Date: Mon, 6 May 2024 10:57:56 +0200 Subject: [PATCH 03/13] replace depreciated function --- build.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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")) From 2cdadc110219961e3ec5ca9db25ec670779b98e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20M=C3=B6lder?= Date: Mon, 6 May 2024 11:07:55 +0200 Subject: [PATCH 04/13] set target --- .github/workflows/rust.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index b1f1ece..f5fe770 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -125,19 +125,19 @@ jobs: os: macOS-12.0 toolchain_target: x86_64-apple-darwin toolchain: stable - aux_args: "" + aux_args: --target x86_64-apple-darwin default: false - target: intel-ventura os: macOS-13.0 toolchain_target: x86_64-apple-darwin toolchain: stable - aux_args: "" + aux_args: --target x86_64-apple-darwin default: false - target: silicon-sonoma os: macOS-14.0 toolchain_target: aarch64-apple-darwin toolchain: stable - aux_args: --target aarch64-apple-darwin + aux_args: "" default: true steps: From 16bb3e156e217396f5f48dd9a0423c8ea2b991de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20M=C3=B6lder?= Date: Mon, 6 May 2024 11:14:16 +0200 Subject: [PATCH 05/13] set linker --- .cargo/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cargo/config b/.cargo/config index 7d7cf07..f1b8368 100644 --- a/.cargo/config +++ b/.cargo/config @@ -1,2 +1,2 @@ -[target.x86_64-unknown-linux-musl] -linker = "x86_64-linux-musl-gcc" +[target.x86_64-apple-darwin] +linker = "x86_64-apple-darwin" From 1f2d528847f75b48a1fe40f51366d8f30c62637d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20M=C3=B6lder?= Date: Mon, 6 May 2024 11:28:13 +0200 Subject: [PATCH 06/13] set default --- .github/workflows/rust.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index f5fe770..3c8bb6e 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -126,19 +126,19 @@ jobs: toolchain_target: x86_64-apple-darwin toolchain: stable aux_args: --target x86_64-apple-darwin - default: false + 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: false + default: true - target: silicon-sonoma os: macOS-14.0 toolchain_target: aarch64-apple-darwin toolchain: stable aux_args: "" - default: true + default: false steps: - name: Checkout repository From 37140ee77954b79e6da1ec082a09d0ee58cf7f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20M=C3=B6lder?= Date: Mon, 6 May 2024 11:53:24 +0200 Subject: [PATCH 07/13] testing --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3c8bb6e..da4307c 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -123,7 +123,7 @@ jobs: include: - target: intel-monterey os: macOS-12.0 - toolchain_target: x86_64-apple-darwin + target: x86_64-apple-darwin toolchain: stable aux_args: --target x86_64-apple-darwin default: true From fce056b4f87793c7a450fdd3587816c4e714bc60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20M=C3=B6lder?= Date: Mon, 6 May 2024 11:54:59 +0200 Subject: [PATCH 08/13] testing --- .github/workflows/rust.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index da4307c..a634e3a 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -123,7 +123,7 @@ jobs: include: - target: intel-monterey os: macOS-12.0 - target: x86_64-apple-darwin + toolchain_target: x86_64-apple-darwin toolchain: stable aux_args: --target x86_64-apple-darwin default: true @@ -147,7 +147,7 @@ jobs: submodules: recursive - name: Install stable toolchain - uses: actions-rs/toolchain@v1.0.6 + uses: dtolnay/rust-toolchain@stable with: toolchain: stable override: true From 59e7d3823a23d8419222af99f73fc564003c8c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20M=C3=B6lder?= Date: Mon, 6 May 2024 11:57:08 +0200 Subject: [PATCH 09/13] set target --- .github/workflows/rust.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index a634e3a..97bec40 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -150,6 +150,7 @@ jobs: uses: dtolnay/rust-toolchain@stable with: toolchain: stable + target: ${{ matrix.toolchain_target }} override: true - name: Install htslib dependencies From db975ed30fe410bad4c80eed49a65a8c33432b43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20M=C3=B6lder?= Date: Mon, 6 May 2024 11:59:50 +0200 Subject: [PATCH 10/13] undo set linker --- .cargo/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cargo/config b/.cargo/config index f1b8368..7d7cf07 100644 --- a/.cargo/config +++ b/.cargo/config @@ -1,2 +1,2 @@ -[target.x86_64-apple-darwin] -linker = "x86_64-apple-darwin" +[target.x86_64-unknown-linux-musl] +linker = "x86_64-linux-musl-gcc" From 9eaa1c24ae63baa6e60a4d36a0198805f817cb82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20M=C3=B6lder?= Date: Mon, 6 May 2024 12:01:46 +0200 Subject: [PATCH 11/13] set default --- .github/workflows/rust.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 97bec40..054d46b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -152,6 +152,7 @@ jobs: toolchain: stable target: ${{ matrix.toolchain_target }} override: true + default: ${{ matrix.default }} - name: Install htslib dependencies run: brew install bzip2 zlib xz curl-openssl From 9a2f22e96adf2848581854f8f90c4551b098d295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20M=C3=B6lder?= Date: Mon, 6 May 2024 12:03:43 +0200 Subject: [PATCH 12/13] change toolchain --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 054d46b..d14a245 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -147,7 +147,7 @@ jobs: submodules: recursive - name: Install stable toolchain - uses: dtolnay/rust-toolchain@stable + uses: actions-rs/toolchain@v1.0.6 with: toolchain: stable target: ${{ matrix.toolchain_target }} From 39c24a517d79c746ec22b6388dee534399e51f62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20M=C3=B6lder?= Date: Mon, 6 May 2024 12:09:23 +0200 Subject: [PATCH 13/13] cleanup --- .github/workflows/rust.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index d14a245..3204432 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -149,7 +149,7 @@ 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 }} @@ -157,13 +157,6 @@ jobs: - 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: