diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml deleted file mode 100644 index 47ea20f..0000000 --- a/.github/workflows/release.yaml +++ /dev/null @@ -1,87 +0,0 @@ -name: build-release -on: - push: - tags: - - "v*.*.*" - -jobs: - release: - name: Build Release Assets - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v5 - - - name: Set up Go - uses: actions/setup-go@v5 - with: - go-version: 1.23.5 - - - name: Build the executables - run: ./mkrel.sh swaycycle ${{ github.ref_name}} - - - name: List the executables - run: ls -l ./releases - - - name: Upload the binaries - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - tag: ${{ github.ref_name }} - file: ./releases/* - file_glob: true - - - name: Build Changelog - id: github_release - uses: mikepenz/release-changelog-builder-action@v5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - mode: "PR" - configurationJson: | - { - "template": "#{{CHANGELOG}}\n\n**Full Changelog**: #{{RELEASE_DIFF}}", - "pr_template": "- #{{TITLE}} (##{{NUMBER}}) by #{{AUTHOR}}\n#{{BODY}}", - "empty_template": "- no changes", - "categories": [ - { - "title": "## New Features", - "labels": ["add", "feature"] - }, - { - "title": "## Bug Fixes", - "labels": ["fix", "bug", "revert"] - }, - { - "title": "## Documentation Enhancements", - "labels": ["doc"] - }, - { - "title": "## Refactoring Efforts", - "labels": ["refactor"] - }, - { - "title": "## Miscellaneus Changes", - "labels": [] - } - ], - "ignore_labels": [ - "duplicate", "good first issue", "help wanted", "invalid", "question", "wontfix" - ], - "label_extractor": [ - { - "pattern": "(.) (.+)", - "target": "$1" - }, - { - "pattern": "(.) (.+)", - "target": "$1", - "on_property": "title" - } - ] - } - - - name: Create Release - uses: softprops/action-gh-release@v2 - with: - body: ${{steps.github_release.outputs.changelog}} diff --git a/.goreleaser.yaml b/.goreleaser.yaml new file mode 100644 index 0000000..69620bc --- /dev/null +++ b/.goreleaser.yaml @@ -0,0 +1,65 @@ +# vim: set ts=2 sw=2 tw=0 fo=cnqoj + +version: 2 + +before: + hooks: + - go mod tidy + +gitea_urls: + api: https://codeberg.org/api/v1 + download: https://codeberg.org + +builds: + - env: + - CGO_ENABLED=0 + goos: + - linux + - freebsd + +archives: + - formats: [tar.gz] + # this name template makes the OS and Arch compatible with the results of `uname`. + name_template: >- + {{ .ProjectName }}_ + {{- title .Os }}_ + {{- if eq .Arch "amd64" }}x86_64 + {{- else if eq .Arch "386" }}i386 + {{- else }}{{ .Arch }}{{ end }} + {{- if .Arm }}v{{ .Arm }}{{ end }}_{{ .Tag }} + # use zip for windows archives + format_overrides: + - goos: windows + formats: [zip] + - goos: linux + formats: [tar.gz,binary] + files: + - src: "*.md" + strip_parent: true + - src: Makefile.dist + dst: Makefile + wrap_in_directory: true + +changelog: + sort: asc + filters: + exclude: + - "^docs:" + - "^test:" + groups: + - title: Improved + regexp: '^.*?(feat|add|new)(\([[:word:]]+\))??!?:.+$' + order: 0 + - title: Fixed + regexp: '^.*?(bug|fix)(\([[:word:]]+\))??!?:.+$' + order: 1 + - title: Changed + order: 999 + +release: + header: "# Release Notes" + footer: >- + + --- + + Full Changelog: [{{ .PreviousTag }}...{{ .Tag }}](https://codeberg.org/scip/swaycycle/compare/{{ .PreviousTag }}...{{ .Tag }}) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml new file mode 100644 index 0000000..e20cc6f --- /dev/null +++ b/.woodpecker/build.yaml @@ -0,0 +1,36 @@ +matrix: + platform: + - linux/amd64 + goversion: + - 1.24 + +labels: + platform: ${platform} + +steps: + build: + when: + event: [push] + image: golang:${goversion} + commands: + - go get + - go build + + linter: + when: + event: [push] + image: golang:${goversion} + commands: + - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.5.0 + - golangci-lint --version + - golangci-lint run ./... + depends_on: [build] + + test: + when: + event: [push] + image: golang:${goversion} + commands: + - go get + - go test -v -cover + depends_on: [build,linter] diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml new file mode 100644 index 0000000..916c008 --- /dev/null +++ b/.woodpecker/release.yaml @@ -0,0 +1,15 @@ +# build release + +labels: + platform: linux/amd64 + +steps: + goreleaser: + image: goreleaser/goreleaser + when: + event: [tag] + environment: + GITEA_TOKEN: + from_secret: DEPLOY_TOKEN + commands: + - goreleaser release --clean --verbose diff --git a/Makefile.dist b/Makefile.dist new file mode 100644 index 0000000..55d2f38 --- /dev/null +++ b/Makefile.dist @@ -0,0 +1,18 @@ +# -*-make-*- + +.PHONY: install all + +tool = rpn +PREFIX = /usr/local +UID = root +GID = 0 + +all: + @echo "Type 'sudo make install' to install the tool." + @echo "To change prefix, type 'sudo make install PREFIX=/opt'" + +install: + install -d -o $(UID) -g $(GID) $(PREFIX)/bin + install -d -o $(UID) -g $(GID) $(PREFIX)/share/doc + install -o $(UID) -g $(GID) -m 555 $(tool) $(PREFIX)/sbin/ + install -o $(UID) -g $(GID) -m 444 *.md $(PREFIX)/share/doc/ diff --git a/README.md b/README.md index d26dd2d..538323e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +[![status-badge](https://ci.codeberg.org/api/badges/15562/status.svg)](https://ci.codeberg.org/repos/15562) +[![License](https://img.shields.io/badge/license-GPL-blue.svg)](https://codeberg.org/scip/swaycycle/raw/branch/main/LICENSE) +[![Go Report Card](https://goreportcard.com/badge/codeberg.org/scip/epuppy)](https://goreportcard.com/report/codeberg.org/scip/swaycycle) + # swaycycle Cycle through all visible windows on a sway[fx] workspace including @@ -9,7 +13,7 @@ the tool to `ALT-tab` and there you go. ## Installation Download the binary for your architecture from the [release -page](https://github.com/TLINDEN/swaycycle/releases) and copy to +page](https://codeberg.org/scip/swaycycle/releases) and copy to some location within your `$PATH`. To build the tool from source, checkout the repo and execute @@ -76,7 +80,7 @@ best way for me to forget to do something. In order to report a bug, unexpected behavior, feature requests or to submit a patch, please open an issue on github: -https://github.com/tlinden/swaycycle/issues. +https://codeberg.org/scip/swaycycle/issues. ## See also @@ -94,7 +98,7 @@ T.v.Dein ## Project homepage -https://github.com/tlinden/swaycycle +https://codeberg.org/scip/swaycycle ## Copyright and License diff --git a/main.go b/main.go index db873b5..8b18307 100644 --- a/main.go +++ b/main.go @@ -18,6 +18,7 @@ along with this program. If not, see . package main import ( + "errors" "fmt" "io" "log" @@ -81,8 +82,7 @@ Options: -v, --version show program version Copyleft (L) 2025 Thomas von Dein. -Licensed under the terms of the GNU GPL version 3. -` +Licensed under the terms of the GNU GPL version 3.` func main() { flag.BoolVarP(&Previous, "prev", "p", false, "cycle backward") @@ -112,7 +112,11 @@ func main() { if err != nil { log.Fatalf("Failed to open logfile %s: %s", Logfile, err) } - defer file.Close() + defer func() { + if err := file.Close(); err != nil { + log.Fatalf("failed to close log file: %s", err) + } + }() setupLogging(file) } else { setupLogging(os.Stdout) @@ -151,7 +155,9 @@ func main() { } if id > 0 && !Notswitch { - switchFocus(id, ipc) + if err := switchFocus(id, ipc); err != nil { + log.Fatalf("%s", err) + } } } @@ -159,7 +165,7 @@ func main() { // its visible windows, store them in the global var Visibles func processJSON(sway *i3ipc.Node) error { if !istype(sway, root) && len(sway.Nodes) == 0 { - return fmt.Errorf("Invalid or empty JSON structure") + return errors.New("invalid or empty JSON structure") } if Dumptree { @@ -231,7 +237,7 @@ func findPrevWindow() int { func switchFocus(id int, ipc *i3ipc.I3ipc) error { responses, err := ipc.RunContainerCommand(id, "focus") if err != nil { - log.Fatalf("failed to send focus command to container %d: %w (%s)", + log.Fatalf("failed to send focus command to container %d: %s (%s)", id, responses[0].Error, err) }