Merge pull request #2 from kz6fittycent/testing

Desktop UI now working in snap

.editorconfig

@@ -1,3 +1,7 @@
 [*.{cpp,h,sh,md,cfg,sample}]
 indent_style = tab
 indent_size = 4
+
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,6 +7,10 @@ assignees: aristocratos
 
 ---
 
+**Read the README.md and search for similar issues before posting a bug report!**
+
+Any bug that can be solved by just reading the [prerequisites](https://github.com/aristocratos/btop#prerequisites) section of the README will likely be ignored.
+
 **Describe the bug**
 
 [A clear and concise description of what the bug is.]
@@ -24,7 +28,7 @@ assignees: aristocratos
 [If applicable, add screenshots to help explain your problem.]
 
 **Info (please complete the following information):**
- - btop++ version: `bpytop -v`
+ - btop++ version: `btop -v`
  - Binary: [self compiled or static binary from release]
  - (If compiled) Compiler and version:
  - Architecture: [x86_64, aarch64, etc.] `uname -m`
@@ -38,16 +42,18 @@ assignees: aristocratos
 
 contents of `~/.config/btop/btop.log`
 
-(try running btop with `--debug` flag if error.log is empty)
+(try running btop with `--debug` flag if btop.log is empty)
 
 **GDB Backtrace**
 
 If btop++ is crashing at start the following steps could be helpful:
 
-1. run `gdb btop`
+(Extra helpful if compiled with `make OPTFLAGS="-O0 -g"`)
+
+1. run (linux): `gdb btop` (macos): `lldb btop`
 
-2. `r` to run, wait for crash and press enter
+2. `r` to run, wait for crash and press enter if prompted, CTRL+L to clear screen if needed.
 
-3. `bt` to get backtrace
+3. (gdb): `thread apply all bt` (lldb): `bt all` to get backtrace for all threads
 
 4. Copy and paste the backtrace here:

.github/workflows/continuous-build-linux.yml

@@ -0,0 +1,113 @@
+name: Continuous Build Linux
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    tags-ignore:
+      - '*.*'
+    paths:
+      - 'src/**'
+      - '!src/osx/**'
+      - '!src/freebsd/**'
+      - 'include/**'
+      - 'Makefile'
+      - '.github/workflows/continuous-build.yml'
+
+jobs:
+  static-build:
+    continue-on-error: true
+    strategy:
+      matrix:
+        toolchain:
+          - aarch64-linux-musl
+          - aarch64_be-linux-musl
+          - arm-linux-musleabi
+          - arm-linux-musleabihf
+          - armeb-linux-musleabi
+          - armeb-linux-musleabihf
+          - armel-linux-musleabi
+          - armel-linux-musleabihf
+          - armv5l-linux-musleabi
+          - armv5l-linux-musleabihf
+          - armv6-linux-musleabi
+          - armv6-linux-musleabihf
+          - armv7l-linux-musleabihf
+          - armv7m-linux-musleabi
+          - armv7r-linux-musleabihf
+          - i486-linux-musl
+          - i686-linux-musl
+          - m68k-linux-musl
+          - mips-linux-musl
+          - mips-linux-musln32sf
+          - mips-linux-muslsf
+          - mips64-linux-musl
+          - mips64-linux-musln32
+          - mips64-linux-musln32sf
+          - mips64el-linux-musl
+          - mips64el-linux-musln32
+          - mips64el-linux-musln32sf
+          - mipsel-linux-musl
+          - mipsel-linux-musln32
+          - mipsel-linux-musln32sf
+          - mipsel-linux-muslsf
+          - powerpc-linux-musl
+          - powerpc-linux-muslsf
+          - powerpc64-linux-musl
+          - powerpc64le-linux-musl
+          - powerpcle-linux-musl
+          - powerpcle-linux-muslsf
+          - riscv32-linux-musl
+          - riscv64-linux-musl
+          - s390x-linux-musl
+          - x86_64-linux-musl
+          - x86_64-linux-muslx32
+
+    # - or1k-linux-musl
+    # - sh2-linux-musl
+    # - sh2-linux-muslfdpic
+    # - sh2eb-linux-musl
+    # - sh2eb-linux-muslfdpic
+    # - sh4-linux-musl
+    # - sh4eb-linux-musl
+
+    runs-on: ubuntu-latest
+    container: muslcc/x86_64:${{ matrix.toolchain }}
+
+    steps:
+      - name: Install build tools
+        run: apk add --no-cache coreutils git make tar zstd
+
+      - name: Fix - Unsafe repository stop
+        run: git config --global --add safe.directory /__w/btop/btop
+
+      - name: Checkout source
+        uses: actions/checkout@v2
+
+      - name: Fix - Stopping at filesystem boundary
+        run: git init # [fix Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).]
+
+      - name: Build
+        run: make STATIC=true STRIP=true
+
+      - name: Make executable
+        run: chmod +x bin/*
+
+      - name: Set up directories
+        run: |
+          mkdir .artifacts
+          mkdir .package
+
+      - name: Create binary atrifacts
+        run: |
+          TOOLCHAIN=${{ matrix.toolchain }}
+          GIT_HASH=$(git rev-parse --short "${{ github.sha }}")
+          FILENAME=btop-${TOOLCHAIN/linux-musl/}-$GIT_HASH
+          cp bin/btop .artifacts/$FILENAME
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: btop-${{ matrix.toolchain }}
+          path: '.artifacts/**'

.github/workflows/continuous-build-macos.yml

@@ -0,0 +1,34 @@
+name: Continuous Build MacOS
+
+on:
+  push:
+    branches:
+      - main
+    tags-ignore:
+      - '*.*'
+    paths:
+      - 'src/**'
+      - '!src/linux/**'
+      - '!src/freebsd/**'
+      - 'include/**'
+      - 'Makefile'
+      - '.github/workflows/*'
+
+jobs:
+  build-osx:
+
+    runs-on: macos-11
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Compile
+        run: |
+          make CXX=g++-11 ARCH=x86_64 STATIC=true STRIP=true
+          GIT_HASH=$(git rev-parse --short "$GITHUB_SHA")
+          mv bin/btop bin/btop-x86_64-BigSur-$GIT_HASH
+          ls -alh bin
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: btop-x86_64-macos-BigSur
+          path: 'bin/*'

.gitignore

@@ -49,4 +49,8 @@ stage/
 build
 bin
 btop
-.*/
+.*/
+
+
+#do not ignore .github directory
+!.github