Disk plotting alpha 1 (#181)

* Added ability to plot using the disk via the `diskplot` command.

Co-authored-by: hugepants <[email protected]>
Co-authored-by: Chris Marslender <[email protected]>
Co-authored-by: Amine Khaldi <[email protected]>

Author: 4 people

.gitattributes

@@ -0,0 +1,3 @@
+* text=auto
+
+*.sh  	  text eol=lf

.github/actions/build-asset-linux.sh renamed to .github/actions/build-asset-unix.sh

@@ -5,25 +5,31 @@
 #   - BB_ARTIFACT_NAME
 #   - BB_VERSION
 #
-set -e
-set -o pipefail
+set -eo pipefail
 
+thread_count=2
+
+if [[ $OSTYPE == 'darwin'* ]]; then
+  thread_count=$(sysctl -n hw.logicalcpu)
+else
+  thread_count=$(nproc --all)
+fi
 
 # TODO: Use specific GCC version
 echo "System: $(uname -s)"
 gcc --version
 
 mkdir build && cd build
 cmake ..
-bash -e -o pipefail ../extract-version.sh
-cmake --build . --target bladebit --config Release -j $(nproc --all)
+bash -eo pipefail ../embed-version.sh
+cmake --build . --target bladebit --config Release -j $thread_count
 chmod +x ./bladebit
 
 # Ensure bladebit version matches expected version
 bb_version="$(./bladebit --version | xargs)"
 
 if [[ "$bb_version" != "$BB_VERSION" ]]; then
-    >&2 echo "Incorrect bladebit version. Got but '$bb_version' expected '$BB_VERSION'."
+    >&2 echo "Incorrect bladebit version. Got '$bb_version' but expected '$BB_VERSION'."
     exit 1
 fi
 

.github/actions/get-version.sh

@@ -1,23 +1,31 @@
 #! /usr/bin/env bash
 # NOTE: This is meant to be run from the repo root dir
 #
-set -e
-set -o pipefail
+set -eo pipefail
 
 os=$1
 arch=$2
 
-version=$(cat VERSION)
-suffix=
-ext="tar.gz"
+version_cmp=($(./extract-version.sh))
 
-if [[ "$GITHUB_REF_NAME" != "master" ]]; then
-    suffix="-$GITHUB_REF_NAME"
-fi
+ver_maj=${version_cmp[0]}
+ver_min=${version_cmp[1]}
+ver_rev=${version_cmp[2]}
+ver_suffix=${version_cmp[3]}
+
+version="${ver_maj}.${ver_min}.${ver_rev}${ver_suffix}"
+
+# echo "Ref name: '$GITHUB_REF_NAME'"
+# if [[ "$GITHUB_REF_NAME" != "master" ]]; then
+#     suffix="-${GITHUB_REF_NAME}"
+# fi
+
+ext="tar.gz"
 
 if [[ "$os" == "windows" ]]; then
     ext="zip"
 fi
 
 echo "::set-output name=BB_VERSION::$version"
-echo "::set-output name=BB_ARTIFACT_NAME::bladebit-v${version}${suffix}-${os}-${arch}.${ext}"
+echo "::set-output name=BB_ARTIFACT_NAME::bladebit-v${version}-${os}-${arch}.${ext}"
+

.github/workflows/attach-release-assets.yml

@@ -10,13 +10,13 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: master
 
       # Setup Node
-      - uses: actions/setup-node@v2
-        with: { node-version: '14' }
+      - uses: actions/setup-node@v3
+        with: { node-version: '16' }
       - run: cd .github/actions && npm install @octokit/action
 
       # Upload Artifacts as Release Assets
@@ -35,6 +35,8 @@ jobs:
             bladebit-v${BB_VERSION}-ubuntu-arm64.tar.gz
             bladebit-v${BB_VERSION}-centos-arm64.tar.gz
             bladebit-v${BB_VERSION}-windows-x86-64.zip
+            bladebit-v${BB_VERSION}-macos-arm64.tar.gz
+            bladebit-v${BB_VERSION}-macos-x86-64.tar.gz
           )
 
           mkdir -p bin

.github/workflows/build-release.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Get Version Number
         id: version_number
@@ -22,7 +22,7 @@ jobs:
         env:
           BB_ARTIFACT_NAME: ${{ steps.version_number.outputs.BB_ARTIFACT_NAME }}
           BB_VERSION: ${{steps.version_number.outputs.BB_VERSION}}
-        run: .github/actions/build-asset-linux.sh
+        run: .github/actions/build-asset-unix.sh
 
       - name: Upload Artifact Ubuntu x86-64
         uses: actions/upload-artifact@v2
@@ -34,10 +34,10 @@ jobs:
   build-centos-x86-64:
     runs-on: ubuntu-20.04
     container:
-      image: centos:8
+      image: quay.io/centos/centos:stream8
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Get Version Number
         id: version_number
@@ -54,7 +54,7 @@ jobs:
           BB_VERSION: ${{steps.version_number.outputs.BB_VERSION}}
         run: |
           source /opt/rh/gcc-toolset-9/enable
-          .github/actions/build-asset-linux.sh
+          .github/actions/build-asset-unix.sh
       
       - name: Upload Artifact CentOS x86-64
         uses: actions/upload-artifact@v2
@@ -64,15 +64,15 @@ jobs:
           if-no-files-found: error
 
   build-ubuntu-arm64:
-    runs-on: [ARM64]
+    runs-on: [ARM64, Linux]
     container:
-      image: ubuntu:20.04
+      image: chianetwork/ubuntu-20.04-builder:latest
     defaults:
       run:
         shell: bash
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Get Version Number
         id: version_number
@@ -82,13 +82,13 @@ jobs:
         run: |
           export DEBIAN_FRONTEND=noninteractive
           apt update
-          apt install -y build-essential git cmake libgmp-dev libnuma-dev
+          apt install -y build-essential git libgmp-dev libnuma-dev
 
       - name: Build
         env:
           BB_ARTIFACT_NAME: ${{ steps.version_number.outputs.BB_ARTIFACT_NAME }}
           BB_VERSION: ${{steps.version_number.outputs.BB_VERSION}}
-        run: .github/actions/build-asset-linux.sh
+        run: .github/actions/build-asset-unix.sh
 
       - name: Upload Artifact Ubuntu ARM64
         uses: actions/upload-artifact@v2
@@ -98,12 +98,12 @@ jobs:
           if-no-files-found: error
 
   build-centos-arm64:
-    runs-on: [ARM64]
+    runs-on: [ARM64, Linux]
     container:
-      image: centos:8
+      image: quay.io/centos/centos:stream8
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Get Version Number
         id: version_number
@@ -120,7 +120,7 @@ jobs:
           BB_VERSION: ${{steps.version_number.outputs.BB_VERSION}}
         run: |
           source /opt/rh/gcc-toolset-9/enable
-          .github/actions/build-asset-linux.sh
+          .github/actions/build-asset-unix.sh
 
       - name: Upload Artifact CentOS ARM64
         uses: actions/upload-artifact@v2
@@ -133,7 +133,7 @@ jobs:
     runs-on: windows-2019
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Get Version Number
         shell: bash
@@ -149,7 +149,7 @@ jobs:
           
           mkdir build && cd build
           cmake ..
-          bash -e -o pipefail ../extract-version.sh
+          bash -e -o pipefail ../embed-version.sh
           cat ../src/Version.h
           cmake --build . --target bladebit --config Release
 
@@ -173,3 +173,60 @@ jobs:
           path: ${{ github.workspace }}/bin/${{ steps.version_number.outputs.BB_ARTIFACT_NAME }}
           if-no-files-found: error
 
+  build-macos-arm64:
+    runs-on: [macOS, ARM64]
+    steps:
+      - name: Cleanup Environment
+        uses: Chia-Network/actions/clean-workspace@main
+
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+
+      - name: Get Version Number
+        id: version_number
+        run: bash -e .github/actions/get-version.sh macos arm64
+
+      - name: Install Prerequisites
+        run: brew install cmake
+
+      - name: Build
+        env:
+          BB_ARTIFACT_NAME: ${{ steps.version_number.outputs.BB_ARTIFACT_NAME }}
+          BB_VERSION: ${{steps.version_number.outputs.BB_VERSION}}
+        run: .github/actions/build-asset-unix.sh
+
+      - name: Upload Artifact macOS arm64
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ steps.version_number.outputs.BB_ARTIFACT_NAME }}
+          path: ${{ github.workspace }}/bin/${{ steps.version_number.outputs.BB_ARTIFACT_NAME }}
+          if-no-files-found: error
+
+  build-macos-x86-64:
+    runs-on: macOS-latest
+    steps:
+      - name: Cleanup Environment
+        uses: Chia-Network/actions/clean-workspace@main
+
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+
+      - name: Get Version Number
+        id: version_number
+        run: .github/actions/get-version.sh macos x86-64
+
+      - name: Install Prerequisites
+        run: brew install cmake
+
+      - name: Build
+        env:
+          BB_ARTIFACT_NAME: ${{ steps.version_number.outputs.BB_ARTIFACT_NAME }}
+          BB_VERSION: ${{steps.version_number.outputs.BB_VERSION}}
+        run: .github/actions/build-asset-unix.sh
+
+      - name: Upload Artifact macOS x86-64
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ steps.version_number.outputs.BB_ARTIFACT_NAME }}
+          path: ${{ github.workspace }}/bin/${{ steps.version_number.outputs.BB_ARTIFACT_NAME }}
+          if-no-files-found: error

.gitignore

@@ -1,19 +1,21 @@
-.[bB]in/
-.[oP]bj/
-[bB]in/
-[oP]bj/
-[tT]mp/
-_[tT]mp/
-
-.vs/
-.sandbox/
-.dist/
-.keys/
-dist/
-
-.DS_Store
-*.log
-park*_hash.txt
-
-lib/*
-build/
+.[bB]in/
+.[oP]bj/
+[bB]in/
+[oP]bj/
+[tT]mp/
+_[tT]mp/
+
+.vs/
+.sandbox/
+.dist/
+.keys/
+dist/
+out/
+
+.DS_Store
+*.log
+park*_hash.txt
+
+lib/*
+build*/
+cmake-build*/