Merge branch 'main' into osx-fix

This commit is contained in:
Jakob P. Liljenberg 2023-12-17 11:56:14 +01:00 committed by GitHub
commit b1fe3779e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 2 deletions

View file

@ -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)

View 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'

View file

@ -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