chore: update GitHub Actions workflows and improve test coverage (#612)

* chore: update GitHub Actions workflows and improve test coverage

* upload test results in a different step

* chore: update golangci-lint version and enhance error handling across multiple files

* chore: update linter configurations and improve code formatting in tests

* chore: update exec command usage to use context for better control

* chore: add JUnit file support for test results and update test command

* chore: remove unused fs import and validate log file path in getFileHandler

Author: creativeprojects

.github/workflows/build.yml

@@ -37,9 +37,9 @@ jobs:
           cache: true
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v8
+        uses: golangci/golangci-lint-action@v9
         with:
-          version: v2.9.0
+          version: v2.11.4
           args: --timeout=30m
 
       - name: Test
@@ -50,12 +50,21 @@ jobs:
       - name: Build
         run: make build
 
-      - name: Code coverage with codecov
+      - name: Upload code coverage to Codecov
         uses: codecov/codecov-action@v6
         with:
           env_vars: OS,GO
-          files: ./coverage.out
+          files: ./coverage.out,./unit-tests.xml
           flags: unittests
           fail_ci_if_error: false
           verbose: true
           token: ${{ secrets.CODECOV_TOKEN }}
+
+      - name: Upload test results to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/codecov-action@v6
+        with:
+          env_vars: OS,GO
+          token: ${{ secrets.CODECOV_TOKEN }}
+          report_type: test_results
+          files: ./unit-tests.xml

.github/workflows/docker.yml

@@ -31,13 +31,13 @@ jobs:
         uses: docker/setup-qemu-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

.github/workflows/release.yml

@@ -27,13 +27,13 @@ jobs:
         uses: docker/setup-qemu-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

.github/workflows/snapshot.yml

@@ -26,13 +26,13 @@ jobs:
         uses: docker/setup-qemu-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

.gitignore

@@ -15,6 +15,7 @@
 
 # test output
 /coverage.out
+/unit-tests.xml
 
 # mock binaries
 /mock

.golangci.yml

@@ -10,12 +10,13 @@ linters:
     - contextcheck
     - copyloopvar
     - decorder
+    - dupl
     - durationcheck
     # - err113
     - errcheck
     - errchkjson
     - errname
-    # - errorlint
+    - errorlint
     - exptostd
     - fatcontext
     # - forcetypeassert
@@ -32,7 +33,7 @@ linters:
     - importas
     - inamedparam
     - ineffassign
-    # - intrange
+    - intrange
     # - ireturn
     - loggercheck
     - makezero
@@ -42,7 +43,7 @@ linters:
     - nilnesserr
     - nilnil
     # - nlreturn
-    # - noctx
+    - noctx
     - nolintlint
     - nosprintfhostport
     # - perfsprint
@@ -80,6 +81,12 @@ linters:
       - third_party$
       - builtin$
       - examples$
+    rules:
+      # Exclude some linters from running on tests files.
+      - path: _test\.go
+        linters:
+          - dupl
+          - gosec
 formatters:
   exclusions:
     generated: lax

Makefile

@@ -28,6 +28,7 @@ README=README.md
 
 TESTS=./...
 COVERAGE_FILE=coverage.out
+JUNIT_FILE=unit-tests.xml
 
 BUILD=build/
 
@@ -98,7 +99,7 @@ $(GOBIN)/mockery: verify $(GOBIN)/eget
 
 $(GOBIN)/golangci-lint-v2: verify $(GOBIN)/eget
 	@echo "[*] $@"
-	"$(GOBIN)/eget" golangci/golangci-lint --tag v2.9.0 --asset=tar.gz --upgrade-only --to '$(GOBIN)/golangci-lint-v2'
+	"$(GOBIN)/eget" golangci/golangci-lint --tag v2.11.4 --asset=tar.gz --upgrade-only --to '$(GOBIN)/golangci-lint-v2'
 
 $(GOBIN)/hugo: $(GOBIN)/eget
 	@echo "[*] $@"
@@ -108,6 +109,10 @@ $(GOBIN)/muffet: verify $(GOBIN)/eget
 	@echo "[*] $@"
 	"$(GOBIN)/eget" raviqqe/muffet --upgrade-only --to '$(GOBIN)'
 
+$(GOBIN)/gotestsum: verify $(GOBIN)/eget
+	@echo "[*] $@"
+	"$(GOBIN)/eget" gotestyourself/gotestsum --upgrade-only --to '$(GOBIN)'
+
 prepare_build: verify download
 	@echo "[*] $@"
 
@@ -173,9 +178,9 @@ test: prepare_test ## Run unit tests
 	@echo "[*] $@"
 	$(GOTEST) $(TESTS)
 
-test-ci: prepare_test ## Run unit tests with coverage (for CI)
+test-ci: $(GOBIN)/gotestsum prepare_test ## Run unit tests with coverage (for CI)
 	@echo "[*] $@"
-	$(GOTEST) -v -race -short -coverprofile='coverage.out' ./...
+	$(GOBIN)/gotestsum --junitfile $(JUNIT_FILE) -- -race -short -coverprofile='$(COVERAGE_FILE)' ./...
 
 coverage: ## Generate coverage report
 	@echo "[*] $@"
@@ -194,6 +199,7 @@ clean: ## Clean up the build artifacts
 	       $(BINARY_WINDOWS_AMD64) \
 	       $(BINARY_WINDOWS_ARM64) \
 	       $(COVERAGE_FILE) \
+		   $(JUNIT_FILE) \
 	       restic_*_linux_amd64* \
 	       ${BUILD}restic* \
 	       ${BUILD}rclone* \

batt/battery.go

@@ -1,6 +1,7 @@
 package batt
 
 import (
+	"errors"
 	"math"
 
 	"github.com/creativeprojects/clog"
@@ -46,28 +47,29 @@ func IsRunningOnBattery() (bool, int, error) {
 
 // isFatalError returns an error if we can't detect any battery state
 func isFatalError(err error) error {
-	switch perr := err.(type) {
-
-	case battery.ErrFatal: // complete failure
-		return err
-
-	case battery.Errors: // range of errors per battery
-		for _, err := range perr {
-			if err != nil {
-				err = isFatalError(err)
+	{
+		var perr battery.ErrFatal
+		var perr1 battery.Errors
+		var perr2 battery.ErrPartial
+		switch {
+		case errors.As(err, &perr):
+			return err
+		case errors.As(err, &perr1):
+			for _, err := range perr1 {
 				if err != nil {
-					return err
+					err = isFatalError(err)
+					if err != nil {
+						return err
+					}
 				}
 			}
+			return nil
+		case errors.As(err, &perr2):
+			if perr2.State != nil {
+				return perr2.State
+			}
+			return nil
 		}
-		return nil
-
-	case battery.ErrPartial: // only some errors on one battery
-		if perr.State != nil {
-			return perr.State
-		}
-		// we're only interested in the state
-		return nil
 	}
 
 	return err

calendar/event_test.go

@@ -210,7 +210,7 @@ func BenchmarkNextTrigger(b *testing.B) {
 			event := NewEvent()
 			_ = event.Parse(testItem.event)
 			b.ResetTimer()
-			for i := 0; i < b.N; i++ {
+			for range b.N {
 				next := event.Next(ref).String()
 				if next == "" {
 					b.Fail()

calendar/value.go

@@ -101,7 +101,7 @@ func (v *Value) HasContiguousRange() bool {
 		return false
 	}
 
-	for i := 0; i < v.maxRange-v.minRange; i++ {
+	for i := range v.maxRange - v.minRange {
 		if v.rangeValues[i] && v.rangeValues[i+1] {
 			return true
 		}
@@ -115,7 +115,7 @@ func (v *Value) HasLongContiguousRange() bool {
 		return false
 	}
 
-	for i := 0; i < v.maxRange-v.minRange-1; i++ {
+	for i := range v.maxRange - v.minRange - 1 {
 		if v.rangeValues[i] && v.rangeValues[i+1] && v.rangeValues[i+2] {
 			return true
 		}