From f21a46134638da7d2fe38915f7298362f8e82452 Mon Sep 17 00:00:00 2001 From: "Sean E. Russell" Date: Mon, 14 Feb 2022 16:44:27 -0600 Subject: [PATCH] Fixed target directory for man page; removes the homebrew trigger in release workflow -- gotop is in core. --- .github/workflows/release.yml | 8 -------- build/nfpm.yml | 2 +- devices/cpu_linux.go | 2 +- devices/remote.go | 1 - docs/releasing.md | 17 +---------------- 5 files changed, 3 insertions(+), 27 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6c15c8d..5cb2c80 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,14 +14,6 @@ jobs: run: echo "##[set-output name=tag;]$(echo ${GITHUB_REF##*/})" id: tag_name - - name: Update Homebrew recipe - uses: peter-evans/repository-dispatch@v1 - with: - token: ${{ secrets.REPO_ACCESS_TOKEN }} - repository: xxxserxxx/homebrew-gotop - event-type: my-release - client-payload: '{"tag": "${{ steps.tag_name.outputs.tag }}"}' - - name: Update and inform Homebrew uses: dawidd6/action-homebrew-bump-formula@v3 with: diff --git a/build/nfpm.yml b/build/nfpm.yml index 6829e43..d5b4e31 100644 --- a/build/nfpm.yml +++ b/build/nfpm.yml @@ -28,4 +28,4 @@ contents: # Manpage - src: ${MANPAGE} - dst: /usr/share/man8/gotop.8.gz + dst: /usr/share/man/man8/gotop.8.gz diff --git a/devices/cpu_linux.go b/devices/cpu_linux.go index 2368218..e4467f4 100644 --- a/devices/cpu_linux.go +++ b/devices/cpu_linux.go @@ -1,8 +1,8 @@ +//go:build linux // +build linux package devices -// TODO gopsutil is at v3, and we're using v2. See if v3 is released and upgrade if so. import "github.com/shirou/gopsutil/cpu" func CpuCount() (int, error) { diff --git a/devices/remote.go b/devices/remote.go index 9eadf13..eeb27b6 100644 --- a/devices/remote.go +++ b/devices/remote.go @@ -23,7 +23,6 @@ var remoteLock sync.Mutex // TODO remote network & disk aren't reported // TODO network resiliency; I believe it currently crashes gotop when the network goes down // TODO Replace custom decoder with https://github.com/prometheus/common/blob/master/expfmt/decode.go -// TODO MQTT / Stomp / MsgPack // FIXME high CPU use when remote goes offline // FIXME higher CPU use when using remote in general func init() { diff --git a/docs/releasing.md b/docs/releasing.md index 452e8b6..0438243 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -7,23 +7,8 @@ 5. Download and verify the correct version of one of the binaries 6. Finish the draft release and publish. 7. Check gotop-builder for a successful everything build; if successful, publish. -8. Notify Nix +8. ~~Notify Nix~~ -- this seems to have been automated by the Nix folks? 9. ~~Notify Homebrew~~ ~~Automated now.~~ Automation broke. Notify manually. 10. Do the Arch release. 1. cd actions/arch-package 2. VERSION=v4.1.2 ./run.sh - -## Nix - -I haven't yet figured this out, so currently just file a ticket and hope somebody on that end updates the package. - -Nix adds new and interesting complexities to the release. - -0. Download the gotop src package; run sha256 on it to get the hash -1. cd to the nixpkgs directory -2. Update the sha256 hash in `pkgs/tools/system/gotop/default.nix` -2. `docker run -it --rm --mount type=bind,source="\$(pwd)",target=/mnt nixos/nix sh` -3. `cd /mnt` -8. install & run vgo2nix to update deps.nix -7. `nix-build -A gotop` -8. When it fails, ...