diff options
author | Nathan Scott <nathans@redhat.com> | 2020-08-26 10:15:00 +1000 |
---|---|---|
committer | Nathan Scott <nathans@redhat.com> | 2020-08-26 10:15:00 +1000 |
commit | d0f31ede5624ed2f35ca25043f6a28adfe3bc171 (patch) | |
tree | d1de2c3836921510961cfdff0b4b82b2719ff61c | |
parent | ba94e0dfda180e83557f2f2c229a71910467aee8 (diff) | |
parent | d64a6a245361b1cce92c77ec677ca8dc1f0fec49 (diff) |
Merge branch 'ci-hwloc-job' of https://github.com/bertwesarg/htop into bertwesarg-ci-hwloc-job
-rw-r--r-- | .github/workflows/ci.yml | 15 | ||||
-rw-r--r-- | Makefile.am | 3 |
2 files changed, 17 insertions, 1 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5482d1eb..8b269bd9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,6 +40,21 @@ jobs: - name: Distcheck run: make distcheck DISTCHECK_CONFIGURE_FLAGS=--enable-werror + build-ubuntu-latest-hwloc: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Install Dependencies + run: sudo apt-get install libncursesw5-dev libhwloc-dev + - name: Bootstrap + run: ./autogen.sh + - name: Configure + run: ./configure --enable-werror --enable-hwloc + - name: Build + run: make + - name: Distcheck + run: make distcheck DISTCHECK_CONFIGURE_FLAGS='--enable-werror --enable-hwloc' + whitespace_check: runs-on: ubuntu-latest steps: diff --git a/Makefile.am b/Makefile.am index 4dc638fd..d455b4d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -203,7 +203,8 @@ endif SUFFIXES = .h BUILT_SOURCES = $(myhtopheaders) $(myhtopplatheaders) -htop_SOURCES = $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources) config.h +htop_SOURCES = $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources) +nodist_htop_SOURCES = config.h .PHONY: htop-headers clean-htop-headers |