From fb782a2ab32cc60ff6bcaec5ae13514ce5ca5390 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Tue, 12 Dec 2023 14:02:27 -0600 Subject: [PATCH 1/6] Create test-snap-can-build.yml --- .github/workflows/test-snap-can-build.yml | 25 +++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/test-snap-can-build.yml diff --git a/.github/workflows/test-snap-can-build.yml b/.github/workflows/test-snap-can-build.yml new file mode 100644 index 0000000..9860b55 --- /dev/null +++ b/.github/workflows/test-snap-can-build.yml @@ -0,0 +1,25 @@ +name: 🧪 Test snap can be built on x86_64 + +on: + push: + branches: [ main ] + 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' From 3ee4b18e57bc9dfe3124ad615bc68aab1772c283 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Tue, 12 Dec 2023 14:14:59 -0600 Subject: [PATCH 2/6] Update bug_report.md - added snap info for bug reports to delineate --- .github/ISSUE_TEMPLATE/bug_report.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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) From 875f08ba5ea72327573235a265f13c0441ee67e5 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Tue, 12 Dec 2023 14:27:16 -0600 Subject: [PATCH 3/6] Update snapcraft.yaml - opengl - Testing opengl plug --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 49f425f35657d9f448e112968a2405421bd1b378 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Fri, 15 Dec 2023 12:00:48 -0600 Subject: [PATCH 4/6] Update test-snap-can-build.yml https://github.com/aristocratos/btop/pull/684#issuecomment-1852801811 --- .github/workflows/test-snap-can-build.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-snap-can-build.yml b/.github/workflows/test-snap-can-build.yml index 9860b55..2355ee8 100644 --- a/.github/workflows/test-snap-can-build.yml +++ b/.github/workflows/test-snap-can-build.yml @@ -3,9 +3,17 @@ name: 🧪 Test snap can be built on x86_64 on: push: branches: [ main ] + paths: + - 'src/**' + - '!src/osx/**' + - '!src/freebsd/**' + - 'include/**' + - 'Makefile' + - '.github/workflows/continuous-build-linux.yml' pull_request: branches: [ main ] - + tags-ignore: + - '*.*' jobs: build: runs-on: ubuntu-latest From 0a388647ccbdaa68a8939a8df806afee29b63489 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Fri, 15 Dec 2023 12:01:45 -0600 Subject: [PATCH 5/6] Update test-snap-can-build.yml whoops --- .github/workflows/test-snap-can-build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-snap-can-build.yml b/.github/workflows/test-snap-can-build.yml index 2355ee8..fde536f 100644 --- a/.github/workflows/test-snap-can-build.yml +++ b/.github/workflows/test-snap-can-build.yml @@ -3,6 +3,8 @@ name: 🧪 Test snap can be built on x86_64 on: push: branches: [ main ] + tags-ignore: + - '*.*' paths: - 'src/**' - '!src/osx/**' @@ -10,10 +12,9 @@ on: - 'include/**' - 'Makefile' - '.github/workflows/continuous-build-linux.yml' - pull_request: + pull_request: branches: [ main ] - tags-ignore: - - '*.*' + jobs: build: runs-on: ubuntu-latest From aab2e8cc552c752cbb15675c8ab96e1bd785ad3b Mon Sep 17 00:00:00 2001 From: "Jakob P. Liljenberg" Date: Sun, 17 Dec 2023 12:03:47 +0100 Subject: [PATCH 6/6] Fixed test-snap-can-build.yml --- .github/workflows/test-snap-can-build.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-snap-can-build.yml b/.github/workflows/test-snap-can-build.yml index fde536f..c66df73 100644 --- a/.github/workflows/test-snap-can-build.yml +++ b/.github/workflows/test-snap-can-build.yml @@ -1,19 +1,27 @@ name: 🧪 Test snap can be built on x86_64 on: + workflow_dispatch: push: - branches: [ main ] + branches: [ main ] tags-ignore: - '*.*' - paths: + paths: - 'src/**' - '!src/osx/**' - '!src/freebsd/**' - 'include/**' - 'Makefile' - - '.github/workflows/continuous-build-linux.yml' - pull_request: - branches: [ main ] + - '.github/workflows/test-snap-can-build.yml' + pull_request: + branches: [ main ] + paths: + - 'src/**' + - '!src/osx/**' + - '!src/freebsd/**' + - 'include/**' + - 'Makefile' + - '.github/workflows/test-snap-can-build.yml' jobs: build: