mirror of
https://github.com/aristocratos/btop.git
synced 2024-09-29 22:51:35 +02:00
Merge branch 'main' into osx-fix
This commit is contained in:
commit
b1fe3779e1
5
.github/ISSUE_TEMPLATE/bug_report.md
vendored
5
.github/ISSUE_TEMPLATE/bug_report.md
vendored
@ -29,6 +29,7 @@ Any bug that can be solved by just reading the [prerequisites](https://github.co
|
|||||||
|
|
||||||
**Info (please complete the following information):**
|
**Info (please complete the following information):**
|
||||||
- btop++ version: `btop -v`
|
- btop++ version: `btop -v`
|
||||||
|
- If using snap: `snap info btop`
|
||||||
- Binary: [self compiled or static binary from release]
|
- Binary: [self compiled or static binary from release]
|
||||||
- (If compiled) Compiler and version:
|
- (If compiled) Compiler and version:
|
||||||
- Architecture: [x86_64, aarch64, etc.] `uname -m`
|
- Architecture: [x86_64, aarch64, etc.] `uname -m`
|
||||||
@ -40,7 +41,9 @@ Any bug that can be solved by just reading the [prerequisites](https://github.co
|
|||||||
|
|
||||||
**Additional context**
|
**Additional context**
|
||||||
|
|
||||||
contents of `~/.config/btop/btop.log`
|
Contents of `~/.config/btop/btop.log`
|
||||||
|
|
||||||
|
Note: The snap uses: `~/snap/btop/current/.config/btop`
|
||||||
|
|
||||||
(try running btop with `--debug` flag if btop.log is empty)
|
(try running btop with `--debug` flag if btop.log is empty)
|
||||||
|
|
||||||
|
34
.github/workflows/test-snap-can-build.yml
vendored
Normal file
34
.github/workflows/test-snap-can-build.yml
vendored
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
name: 🧪 Test snap can be built on x86_64
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ main ]
|
||||||
|
tags-ignore:
|
||||||
|
- '*.*'
|
||||||
|
paths:
|
||||||
|
- 'src/**'
|
||||||
|
- '!src/osx/**'
|
||||||
|
- '!src/freebsd/**'
|
||||||
|
- 'include/**'
|
||||||
|
- 'Makefile'
|
||||||
|
- '.github/workflows/continuous-build-linux.yml'
|
||||||
|
pull_request:
|
||||||
|
branches: [ main ]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
node-version: [16.x]
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
|
||||||
|
- uses: snapcore/action-build@v1
|
||||||
|
id: build
|
||||||
|
|
||||||
|
- uses: diddlesnaps/snapcraft-review-action@v1
|
||||||
|
with:
|
||||||
|
snap: ${{ steps.build.outputs.snap }}
|
||||||
|
isClassic: 'false'
|
@ -37,6 +37,7 @@ apps:
|
|||||||
- network-observe
|
- network-observe
|
||||||
- home
|
- home
|
||||||
- removable-media
|
- removable-media
|
||||||
|
- opengl
|
||||||
|
|
||||||
parts:
|
parts:
|
||||||
btop:
|
btop:
|
||||||
@ -47,7 +48,6 @@ parts:
|
|||||||
- PREFIX=/usr/local
|
- PREFIX=/usr/local
|
||||||
- STATIC=true
|
- STATIC=true
|
||||||
- ADDFLAGS="-D SNAPPED"
|
- ADDFLAGS="-D SNAPPED"
|
||||||
|
|
||||||
build-packages:
|
build-packages:
|
||||||
- coreutils
|
- coreutils
|
||||||
- sed
|
- sed
|
||||||
|
Loading…
Reference in New Issue
Block a user