Print details about os and mounted filesystems

.circleci/config.yml

@@ -65,7 +65,7 @@ env: &env
       # If you have not committed packcheck.sh in your repo at PACKCHECK
       # then it is automatically pulled from this URL.
       PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
-      PACKCHECK_GITHUB_COMMIT: "v0.7.1"
+      PACKCHECK_GITHUB_COMMIT: "03f9e753567d08835e342c8d24a406d5a1e1582e"
 
     # ubuntu seems to have better support than debian on CI systems
     docker:

.cirrus.yml

@@ -36,7 +36,7 @@ task:
     # packcheck location and revision
     PACKCHECK: "./packcheck.sh"
     PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
-    PACKCHECK_GITHUB_COMMIT: "v0.7.1"
+    PACKCHECK_GITHUB_COMMIT: "03f9e753567d08835e342c8d24a406d5a1e1582e"
 
     # Pull token from "secrets" setting of the github repo
     # COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}

.github/workflows/packcheck.yml

@@ -88,7 +88,7 @@ jobs:
       # If you have not committed packcheck.sh in your repo at PACKCHECK
       # then it is automatically pulled from this URL.
       PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
-      PACKCHECK_GITHUB_COMMIT: "v0.7.1"
+      PACKCHECK_GITHUB_COMMIT: "03f9e753567d08835e342c8d24a406d5a1e1582e"
 
       # ------------------------------------------------------------------------
       # Final build variables
@@ -158,7 +158,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/cache@v2
+    - uses: actions/cache@v3
       name: Cache common directories
       with:
         path: |

appveyor.yml

@@ -63,7 +63,7 @@ environment:
     # If you have not committed packcheck.sh in your repo at PACKCHECK_LOCAL_PATH
     # then it is automatically pulled from this URL.
     PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
-    PACKCHECK_GITHUB_COMMIT: "v0.7.1"
+    PACKCHECK_GITHUB_COMMIT: "03f9e753567d08835e342c8d24a406d5a1e1582e"
 
     # Override the temp directory to avoid sed escaping issues
     # See https://github.com/haskell/cabal/issues/5386

packcheck.sh

@@ -101,6 +101,8 @@ require_cmd () {
 
 # $1: command
 function run_verbose() {
+  # XXX redirecting to stderr leads to misaligned output because stdout and
+  # stdin are printed at different times.
   echo "$*" 1>&2
   bash -c "$*"
 }
@@ -171,10 +173,16 @@ show_machine_info() {
   local os=$(uname)
   case "$os" in
     Linux)
-      echo "OS: $os"
+      #echo "OS: $os"
+      run_verbose lsb_release -a || true
+      echo
+      run_verbose uname -a || true
+
+      show_step "CPU"
+      echo "lscpu"
       lscpu | grep "^Archi\|^CPU\|^Bogo\|^Hyper\|^Virtualiz"
 
-      echo "Memory:"
+      show_step "Memory"
       run_verbose free -h || true
 
       show_step "Container/cgroup information"
@@ -188,11 +196,32 @@ show_machine_info() {
       sudo -n cat /proc/1/environ | tr '\0' '\n' | grep "^container=" || true
       run_verbose cat /sys/fs/cgroup/cpu/cpu.cfs_period_us || true
       run_verbose cat /sys/fs/cgroup/cpu/cpu.cfs_quota_us || true
-      run_verbose cat /sys/fs/cgroup/memory/memory.limit_in_bytes || true ;;
+      run_verbose cat /sys/fs/cgroup/memory/memory.limit_in_bytes || true
+
+      show_step "Filesystems"
+      run_verbose mount || true
+
+      show_step "Disk Usage"
+      run_verbose df -T || true ;;
+
     FreeBSD)
-      echo "OS: FreeBSD" ;;
+      echo "OS: FreeBSD"
+
+      show_step "Filesystems"
+      run_verbose mount || true
+
+      show_step "Disk Usage"
+      run_verbose df || true ;;
+
     Darwin)
-      echo "OS: MacOS" ;;
+      echo "OS: MacOS"
+
+      show_step "Filesystems"
+      run_verbose mount || true
+
+      show_step "Disk Usage"
+      run_verbose df -Y || true ;;
+
     MINGW*)
       echo "OS: Windows (MINGW)" ;;
     *) die "OS: Unknown OS [$os]" ;;
@@ -914,8 +943,8 @@ ghcup_install() {
   else
     # User can either add it in the PATH or we can use the full path of the
     # tool either as found in PATH or use GHCUP_PATH directly. We should
-    # probably fix each tool's location as found and use that rather using it
-    # from PATH.
+    # probably fix each tool's location as found and use that rather
+    # than using it from PATH.
     if test -e "$GHCUP_PATH"
     then
       die "$GHCUP_PATH already exists, not overwriting."