Add CI for 1.12.0

Author: mulimoen

.github/workflows/ci.yml

@@ -35,6 +35,31 @@ jobs:
           command: ${{matrix.command}}
           args: "${{matrix.command == 'fmt' && '--all -- --check' || '-- -D warnings'}}"
 
+  brew:
+    name: brew
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - {version: [email protected]}
+          - {version: [email protected]}
+          - {version: [email protected]}
+          - {version: hdf5-mpi, mpi: true}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with: {submodules: true}
+      - name: Install Rust (${{matrix.rust}})
+        uses: actions-rs/toolchain@v1
+        with: {toolchain: stable, profile: minimal, override: true}
+      - name: Install HDF5 (${{matrix.version}})
+        run: brew install ${{matrix.version}}
+      - name: Build and test all crates
+        run: |
+          [ "${{matrix.mpi}}" != "" ] && FEATURES=mpio
+          cargo test -vv --features="$FEATURES"
+
   conda:
     name: conda
     runs-on: ${{matrix.os}}-latest
@@ -55,6 +80,9 @@ jobs:
           - {os: macos, version: 1.10.5, mpi: openmpi, channel: conda-forge, rust: beta}
           - {os: ubuntu, version: 1.10.6, channel: anaconda, rust: stable}
           - {os: ubuntu, version: 1.10.6, mpi: mpich, channel: conda-forge, rust: nightly}
+          - {os: ubuntu, version: 1.12.0, mpi: openmpi, channel: conda-forge, rust: stable}
+          - {os: macos, version: 1.12.0, channel: conda-forge, rust: stable}
+          - {os: windows, version: 1.12.0, channel: conda-forge, rust: stable}
     defaults:
       run:
         shell: bash -l {0}
@@ -102,26 +130,6 @@ jobs:
       - name: Build and test all crates
         run: cargo test --workspace -v --features hdf5-sys/static,hdf5-sys/zlib --exclude hdf5-derive
 
-  brew:
-    name: brew
-    runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        version: [1.8, '1.10']
-        rust: [stable]
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-        with: {submodules: true}
-      - name: Install Rust (${{matrix.rust}})
-        uses: actions-rs/toolchain@v1
-        with: {toolchain: '${{matrix.rust}}', profile: minimal, override: true}
-      - name: Install HDF5 (${{matrix.version}})
-        run: brew install hdf5@${{matrix.version}}
-      - name: Build and test all crates
-        run: cargo test -v
-
   apt:
     name: apt
     runs-on: ubuntu-${{matrix.ubuntu}}

hdf5-sys/build.rs

@@ -300,35 +300,55 @@ mod macos {
         }
         // We have to explicitly support homebrew since the HDF5 bottle isn't
         // packaged with pkg-config metadata.
-        let (v18, v110) = if let Some(version) = config.version {
-            (version.major == 1 && version.minor == 8, version.major == 1 && version.minor == 10)
+        let (v18, v110, v112) = if let Some(version) = config.version {
+            (
+                version.major == 1 && version.minor == 8,
+                version.major == 1 && version.minor == 10,
+                version.major == 1 && version.minor == 12,
+            )
         } else {
-            (false, false)
+            (false, false, false)
         };
         println!(
             "Attempting to find HDF5 via Homebrew ({})...",
             if v18 {
                 "1.8.*"
             } else if v110 {
                 "1.10.*"
+            } else if v112 {
+                "1.12.*"
             } else {
                 "any version"
             }
         );
-        if !v18 {
+        if !(v18 || v110) {
+            if let Some(out) = run_command("brew", &["--prefix", "[email protected]"]) {
+                if is_root_dir(&out) {
+                    config.inc_dir = Some(PathBuf::from(out).join("include"));
+                }
+            }
+        }
+        if config.inc_dir.is_none() && !v18 {
             if let Some(out) = run_command("brew", &["--prefix", "[email protected]"]) {
                 if is_root_dir(&out) {
                     config.inc_dir = Some(PathBuf::from(out).join("include"));
                 }
             }
         }
-        if config.inc_dir.is_none() && !v110 {
+        if config.inc_dir.is_none() {
             if let Some(out) = run_command("brew", &["--prefix", "[email protected]"]) {
                 if is_root_dir(&out) {
                     config.inc_dir = Some(PathBuf::from(out).join("include"));
                 }
             }
         }
+        if config.inc_dir.is_none() {
+            if let Some(out) = run_command("brew", &["--prefix", "hdf5-mpi"]) {
+                if is_root_dir(&out) {
+                    config.inc_dir = Some(PathBuf::from(out).join("include"));
+                }
+            }
+        }
         if let Some(ref inc_dir) = config.inc_dir {
             println!("Found Homebrew HDF5 headers at:");
             println!("    {:?}", inc_dir);