Add macos-12 (#76)

* Move to macos-12 instead of macOS-11
* Switch to using "-C instrument-coverage"
* Avoid permissions errors on macos
* Add some details for debugging and build docs first on all variants
* Fix docs warnings
* Add some details for debugging and build docs first on all variants

Author: andrewdavidmackenzie

.github/workflows/rust.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-latest, macos-11 ]
+        os: [ ubuntu-latest, macos-11, macos-12 ]
         rust: [stable, beta]
         experimental: [false]
         include:
@@ -28,6 +28,9 @@ jobs:
           - os: macos-11
             rust: nightly
             experimental: true
+          - os: macos-12
+            rust: nightly
+            experimental: true
 
     continue-on-error: ${{ matrix.experimental }}
 
@@ -45,15 +48,19 @@ jobs:
 
     - name: ConfigureCoverage
       if: matrix.rust == 'nightly'
-      run: make configure-coverage
+      run: |
+        cargo install grcov
+        rustup component add llvm-tools-preview
+        echo RUSTFLAGS="-C instrument-coverage" >> "$GITHUB_ENV"
+        echo LLVM_PROFILE_FILE="libproc-%p-%m.profraw" >> "$GITHUB_ENV"
 
-    - name: Run Tests
-      if: matrix.os != 'macos-11'
-      run:  make run-tests
+    - name: Run Tests on Linux
+      if: runner.os == 'Linux'
+      run:  env "PATH=$PATH" cargo test
 
     - name: Run Tests as Root on Mac
-      if: matrix.os == 'macos-11'
-      run:  make run-tests-root
+      if: runner.os == 'macOS'
+      run:  sudo env "PATH=$PATH" cargo test
 
     - name: UploadCoverage
       if: matrix.rust == 'nightly'
@@ -63,6 +70,7 @@ jobs:
       if: matrix.os == 'ubuntu-latest' && matrix.rust == 'stable'
       run: make build-docs
 
+    # Only deploy docs once - from one matrix combination, and only when on master (i.e. post PR merge)
     - name: DeployDocsToGHPagesFromMaster
       uses: JamesIves/[email protected]
       if: matrix.os == 'ubuntu-latest' && matrix.rust == 'stable' && github.ref == 'refs/heads/master'

src/libproc/pid_rusage.rs

@@ -22,8 +22,7 @@ pub trait PIDRUsage: Default {
     fn set_memory_used(&mut self, used: u64);
 }
 
-/// `PidRUsageFlavor`
-/// From <https://opensource.apple.com/source/xnu/xnu-4903.221.2/bsd/sys/resource.h>
+/// `PidRUsageFlavor` From <https://opensource.apple.com/source/xnu/xnu-4903.221.2/bsd/sys/resource.h>
 pub enum PidRUsageFlavor {
     /// Version 0
     V0 = 0,