Commit Graph

319 Commits

Author SHA1 Message Date
Matt McCormick
171917715d
Merge pull request #76 from thewtex/dependabot/github_actions/actions/upload-artifact-3
Bump actions/upload-artifact from 2 to 3
2022-05-06 22:42:10 -04:00
Matt McCormick
56b71ea699
Merge pull request #77 from thewtex/dependabot/github_actions/actions/download-artifact-3
Bump actions/download-artifact from 2 to 3
2022-05-06 22:42:00 -04:00
Matt McCormick
651b134b09
Merge pull request #78 from thewtex/dependabot/github_actions/actions/stale-5
Bump actions/stale from 4 to 5
2022-05-06 22:41:50 -04:00
dependabot[bot]
a449ed042c
Bump actions/stale from 4 to 5
Bumps [actions/stale](https://github.com/actions/stale) from 4 to 5.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-11 04:21:40 +00:00
dependabot[bot]
bc4c0ddbad
Bump actions/download-artifact from 2 to 3
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-11 04:21:36 +00:00
dependabot[bot]
961351433c
Bump actions/upload-artifact from 2 to 3
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-11 04:21:33 +00:00
Matt McCormick
0b6cd002b3 Update required CMake version in the README 2022-03-07 16:48:05 -05:00
Matt McCormick
d87de550f4
Merge pull request #74 from thewtex/dependabot/github_actions/actions/checkout-3
Bump actions/checkout from 2 to 3
v3.6.0
2022-03-03 11:23:14 -05:00
Matt McCormick
4de9c077f5
Merge pull request #75 from thewtex/aarch-string
Aarch string
2022-03-03 11:22:19 -05:00
Matt McCormick
974e40bcb5 Disable manylinux2014-aarch64 builds
Odd linker errors:

: && /usr/xcc/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-g++ --sysroot=/usr/xcc/aarch64-unknown-linux-gnueabi/aarch64-unknown-linux-gnueabi/sysroot -I /usr/xcc/aarch64-unknown-linux-gnueabi/include/ -std=c++11 -g  CMakeFiles/tmux-mem-cpu-load.dir/common/main.cc.o CMakeFiles/tmux-mem-cpu-load.dir/common/memory.cc.o CMakeFiles/tmux-mem-cpu-load.dir/common/graph.cc.o CMakeFiles/tmux-mem-cpu-load.dir/common/powerline.cc.o CMakeFiles/tmux-mem-cpu-load.dir/linux/memory.cc.o CMakeFiles/tmux-mem-cpu-load.dir/linux/cpu.cc.o CMakeFiles/tmux-mem-cpu-load.dir/common/load.cc.o -o tmux-mem-cpu-load   && :
CMakeFiles/tmux-mem-cpu-load.dir/common/main.cc.o: In function `cpu_string[abi:cxx11](CPU_MODE, unsigned int, unsigned int, bool, bool, bool)':
/work/build-manylinux2014-aarch64/../common/main.cc:47: undefined reference to `std::__cxx11::basic_ostringstream<char, std::char_traits<char>, std::allocator<char> >::basic_ostringstream()'
/work/build-manylinux2014-aarch64/../common/main.cc:86: undefined reference to `std::basic_ostream<char, std::char_traits<char> >& std::operator<< <char, std::char_traits<char>, std::allocator<char> >(std::basic_ostream<char, std::char_traits<char> >&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)'
/work/build-manylinux2014-aarch64/../common/main.cc:86: undefined reference to `std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::~basic_string()'
/work/build-manylinux2014-aarch64/../common/main.cc:107: undefined reference to `std::__cxx11::basic_ostringstream<char, std::char_traits<char>, std::allocator<char> >::str() const'
/work/build-manylinux2014-aarch64/../common/main.cc:47: undefined reference to `std::__cxx11::basic_ostringstream<char, std::char_traits<char>, std::allocator<char> >::~basic_ostringstream()'
/work/build-manylinux2014-aarch64/../common/main.cc:86: undefined reference to `std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::~basic_string()'
/work/build-manylinux2014-aarch64/../common/main.cc:47: undefined reference to `std::__cxx11::basic_ostringstream<char, std::char_traits<char>, std::allocator<char> >::~basic_ostringstream()'
CMakeFiles/tmux-mem-cpu-load.dir/common/main.cc.o: In function `main':
2022-03-03 09:25:18 -05:00
dependabot[bot]
486e618f41
Bump actions/checkout from 2 to 3
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-02 04:26:30 +00:00
Matt McCormick
f29c4ff5c5 Use standard CMake C++11 enablement 2022-02-17 15:19:02 -05:00
Matt McCormick
8052318680 Undefined references to std::string in aarch64 build 2022-02-17 12:32:51 -05:00
Matt McCormick
0077534b96
Merge pull request #72 from blackheaven/master
More consistent CPU load colors and lower memory usage threshold
2022-02-16 17:16:52 -05:00
Gautier DI FOLCO
1ac6729ef1 Less sensitive memory default thresholds 2021-12-07 23:19:49 +01:00
Gautier DI FOLCO
04419c8cdf Progressive colors for CPU usage 2021-12-07 23:19:09 +01:00
Matt McCormick
b6afa5c5e9
Merge pull request #71 from thewtex/freebsd-sig
Consistent get_cpu_count for FreeBSD
v3.5.1
2021-08-04 17:43:16 -04:00
Matt McCormick
96ea7dc050 Consistent get_cpu_count for FreeBSD 2021-08-04 15:05:19 -04:00
Matt McCormick
0ca29c4ecd
Merge pull request #69 from thewtex/consistent-precision
consistent precision
v3.5.0
2021-08-03 18:43:21 -04:00
Matt McCormick
4be44f35f7 Specify precision in CPU percent output
More consistent formatting.
2021-08-03 18:38:28 -04:00
Matt McCormick
8c2f0e2cfd Use consistent precision for load output
Reduce variations in output.
2021-08-03 18:29:09 -04:00
Matt McCormick
37b08090f1
Merge pull request #68 from thewtex/dependabot/github_actions/actions/stale-4
Bump actions/stale from 3 to 4
2021-08-03 17:36:10 -04:00
Matt McCormick
c83d7ee712
DOC: Add GitHub Actions badge to README 2021-08-03 17:35:37 -04:00
dependabot[bot]
8b6e394dd3
Bump actions/stale from 3 to 4
Bumps [actions/stale](https://github.com/actions/stale) from 3 to 4.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-03 21:28:38 +00:00
Matt McCormick
31768a203b
Merge pull request #67 from bensuperpc/multi-arch-ci
Add Github CI and Multi-arch builder
2021-08-03 17:28:14 -04:00
Bensuperpc
9113cefccc Merge branch 'master' into multi-arch-ci 2021-07-07 02:59:23 +02:00
Bensuperpc
39348840c1 Merge branch 'improve_release' 2021-07-07 02:58:35 +02:00
Bensuperpc
3ec357c63c Improve release trigger
Improve release trigger

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-07-07 02:57:38 +02:00
Bensuperpc
acea452957 Fix workflow
Fix Release workflow

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-07-07 02:53:42 +02:00
Bensuperpc
705830d1df
Merge pull request #1 from bensuperpc/multi-arch-ci
Multi arch ci
2021-07-07 02:51:17 +02:00
Bensuperpc
8c9c31798c Add Release workflow
Add Release workflow

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-07-07 02:46:40 +02:00
Bensuperpc
bf41ae4393 Remove Emscripten
Remove Emscripten

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-07-07 02:38:25 +02:00
Bensuperpc
e652a93b72 Add contributor in README
Add contributor in README

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-07-07 02:36:25 +02:00
Bensuperpc
db4edaeecc Remove unsupported system
Remove unsupported system

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-07-07 02:30:01 +02:00
Bensuperpc
39c6c57bf3 Add github CI and builder scripts (dockcross)
Add github CI and builder scripts (dockcross)

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-07-07 02:15:22 +02:00
Matt McCormick
d5007d4694
Merge pull request #62 from littlewu2508/master
uint32_t get_cpu_count() : support >255 threads
2020-03-05 18:00:15 -05:00
WuYiyang
10ad0b29fd delete the accidentally added header 2020-03-01 09:53:37 +00:00
WuYiyang
fc78a0bdad display mem in GB when >100000MB in default mode 2020-03-01 09:44:31 +00:00
WuYiyang
d34821cb95 uint32_t get_cpu_count() : support >255 threads 2020-02-23 02:40:10 +00:00
Matt McCormick
f96ae7a76a
Merge pull request #61 from fluffykhv/fbsd-mem
Fix calculate memory usage on FreeBSD
2019-12-20 17:25:15 -05:00
Dima Panov
e24890652e Fix calculate memory usage on FreeBSD 2019-12-20 02:47:32 +10:00
Matt McCormick
12417dc358
Merge pull request #60 from jasperla/openbsd/ncpuonline
openbsd: use actual number of cpus being used
2019-12-02 16:18:38 -05:00
Jasper Lievisse Adriaanse
2107ea84f1 openbsd: use actual number of cpus being used 2019-12-02 14:06:38 +01:00
Matt McCormick
67657e6312
Merge pull request #58 from tony/patch-1
🙈 Ignore ninja generated files
2019-06-18 18:22:45 -04:00
Tony Narlock
15da3e0a59
🙈 Ignore ninja generated files
Generated when using `cmake -GNinja .`
2019-04-22 13:12:21 -05:00
Matt McCormick
2fdcf93296
Merge pull request #54 from thewtex/windows
Windows
2018-04-23 21:59:20 -04:00
Matt McCormick
7cf58a8367 windows: Initial addition 2018-04-23 21:52:17 -04:00
Matt McCormick
3fad77c3ac Use target_include_directories 2018-04-14 09:47:35 -04:00
Matt McCormick
abe7290511
Merge pull request #52 from jmmweismiller/master
Updated used memory calculation.
2018-04-13 23:35:56 -04:00
John Weismiller
22f4db4b0e Updated used memory calculation.
Changed used memory calculation to account for shared memory in accordance with this:
https://github.com/KittyKatt/screenFetch/issues/386#issuecomment-249312716
2018-01-18 13:25:54 -06:00