summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakob P. Liljenberg <admin@qvantnet.com>2023-12-17 11:54:49 +0100
committerGitHub <noreply@github.com>2023-12-17 11:54:49 +0100
commit2d15c41555024dba0c1e0af91220fa2f8406b9f4 (patch)
tree202c38835b7045f1c2d64df4f9e73f96b29a21c0
parentfe699b433398818cf2145d2ca4d2e364a089a4d2 (diff)
parent2d3e453ed527f2d045b9e615422f708820438298 (diff)
Merge pull request #684 from kz6fittycent/main
-rw-r--r--.github/ISSUE_TEMPLATE/bug_report.md5
-rw-r--r--.github/workflows/test-snap-can-build.yml34
-rw-r--r--snap/snapcraft.yaml2
3 files changed, 39 insertions, 2 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 3c937d1..7ed6a21 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -29,6 +29,7 @@ Any bug that can be solved by just reading the [prerequisites](https://github.co
**Info (please complete the following information):**
- btop++ version: `btop -v`
+ - If using snap: `snap info btop`
- Binary: [self compiled or static binary from release]
- (If compiled) Compiler and version:
- 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**
-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)
diff --git a/.github/workflows/test-snap-can-build.yml b/.github/workflows/test-snap-can-build.yml
new file mode 100644
index 0000000..fde536f
--- /dev/null
+++ b/.github/workflows/test-snap-can-build.yml
@@ -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'
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 16978fe..f6b2729 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -37,6 +37,7 @@ apps:
- network-observe
- home
- removable-media
+ - opengl
parts:
btop:
@@ -47,7 +48,6 @@ parts:
- PREFIX=/usr/local
- STATIC=true
- ADDFLAGS="-D SNAPPED"
-
build-packages:
- coreutils
- sed