Fix GitHub workflows for PR checks and releases (#3)

* fix(ci): fix GitHub workflows for PR checks and releases

* upd golangci config

Signed-off-by: Denis Panfilov <gh@flaticols.dev>

* llinting

Signed-off-by: Denis Panfilov <gh@flaticols.dev>

* fix(test): make timeout test more tolerant of timing variations

---------

Signed-off-by: Denis Panfilov <gh@flaticols.dev>

Author: flaticols

.github/workflows/ci.yml

@@ -1,27 +1,57 @@
-name: Lint & Tests
+name: CI
 
 on:
   push:
-    branches: [main]
+    branches: [latest]
   pull_request:
-    branches: [main]
+    branches: ['*']
 
 jobs:
-  test:
-    name: Test and Lint
+  lint:
+    name: Lint
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23
+          go-version: '1.23'
 
-      - name: golangci-lint
+      - name: Run golangci-lint
         uses: golangci/golangci-lint-action@v8
         with:
           version: v2.1
 
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.23'
+
       - name: Run tests
         run: go test -v ./...
+
+      - name: Run benchmarks
+        run: go test -bench=. -benchmem ./...
+
+  ci-status:
+    name: CI Status
+    runs-on: ubuntu-latest
+    needs: [lint, test]
+    if: always()
+    steps:
+      - name: Check CI Status
+        run: |
+          if [ "${{ needs.lint.result }}" = "success" ] && [ "${{ needs.test.result }}" = "success" ]; then
+            echo "All checks passed!"
+            exit 0
+          else
+            echo "Some checks failed!"
+            exit 1
+          fi

.github/workflows/release.yml

@@ -18,6 +18,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          ref: ${{ github.event.ref }}
 
       - name: Get previous tag
         id: previous_tag
@@ -34,6 +35,7 @@ jobs:
           skip-version-file: true
           skip-commit: true
           skip-tag: true
+          skip-git-pull: true
           release-count: 0
           from-tag: ${{ steps.previous_tag.outputs.previous_tag }}
           to-tag: ${{ github.ref }}

.golangci.yml

@@ -1,31 +1,25 @@
-version: 2
+version: "2"
 
 linters:
+  default: none
   enable:
-    - govet
+    - bodyclose
+    - dupl
+    - asciicheck
+    - errcheck
+    - errchkjson
+    - errname
+    - errorlint
+    - nilerr
+    - nilnil
     - staticcheck
-    - gosec
+  exclusions:
+    paths-except:
+      - examples/*
 
-linters-settings:
-  gosec:
-    excludes:
-      - G404
-
-issues:
-  exclude-rules:
-    # Exclude from examples  
-    - path: examples/
-      linters:
-        - all
-
-    # Exclude from tests
-    - path: _test\.go
-      linters:
-        - gosec
+formatters:
+  enable: []
 
 run:
-  timeout: 5m
-  tests: true
-  allow-parallel-runners: true
-  skip-dirs:
-    - examples
+  build-tags:
+    - mock

helpers_test.go

@@ -18,44 +18,44 @@ func TestRetryWithContext(t *testing.T) {
 	t.Run("respects context cancellation", func(t *testing.T) {
 		ctx, cancel := context.WithCancel(context.Background())
 		attempts := 0
-		
+
 		// Cancel context after a short delay
 		go func() {
 			time.Sleep(10 * time.Millisecond)
 			cancel()
 		}()
-		
+
 		err := RetryWithContext(ctx, func() error {
 			attempts++
 			return errors.New("always fail")
 		}, Initial(20*time.Millisecond))
-		
+
 		if !errors.Is(err, context.Canceled) {
 			t.Errorf("expected context.Canceled error, got: %v", err)
 		}
-		
+
 		// Should have only attempted once or twice before context was cancelled
 		if attempts > 2 {
 			t.Errorf("expected at most 2 attempts, got %d", attempts)
 		}
 	})
-	
+
 	t.Run("succeeds with active context", func(t *testing.T) {
 		ctx := context.Background()
 		attempts := 0
-		
+
 		err := RetryWithContext(ctx, func() error {
 			attempts++
 			if attempts < 3 {
 				return errors.New("temporary error")
 			}
 			return nil
 		}, Initial(10*time.Millisecond))
-		
+
 		if err != nil {
 			t.Errorf("expected success, got error: %v", err)
 		}
-		
+
 		if attempts != 3 {
 			t.Errorf("expected 3 attempts, got %d", attempts)
 		}
@@ -66,19 +66,19 @@ func TestRetryWithLogging(t *testing.T) {
 	var buf bytes.Buffer
 	logger := log.New(&buf, "", 0)
 	attempts := 0
-	
+
 	err := RetryWithLogging(func() error {
 		attempts++
 		if attempts < 3 {
 			return fmt.Errorf("attempt %d failed", attempts)
 		}
 		return nil
 	}, logger, Initial(10*time.Millisecond))
-	
+
 	if err != nil {
 		t.Errorf("expected success, got error: %v", err)
 	}
-	
+
 	logs := buf.String()
 	if !strings.Contains(logs, "Attempt 1 failed: attempt 1 failed") {
 		t.Errorf("expected log for attempt 1, got: %s", logs)
@@ -95,26 +95,26 @@ func TestRetryWithCondition(t *testing.T) {
 	t.Run("permanent errors not retried", func(t *testing.T) {
 		attempts := 0
 		permanentErr := errors.New("permanent error")
-		
+
 		err := RetryWithCondition(func() error {
 			attempts++
 			return permanentErr
 		}, func(err error) bool {
-			return err != permanentErr
+			return !errors.Is(err, permanentErr)
 		}, Tries(5))
-		
-		if err != permanentErr {
+
+		if !errors.Is(err, permanentErr) {
 			t.Errorf("expected permanent error, got: %v", err)
 		}
-		
+
 		if attempts != 1 {
 			t.Errorf("expected 1 attempt (no retry), got %d", attempts)
 		}
 	})
-	
+
 	t.Run("retryable errors are retried", func(t *testing.T) {
 		attempts := 0
-		
+
 		err := RetryWithCondition(func() error {
 			attempts++
 			if attempts < 3 {
@@ -124,11 +124,11 @@ func TestRetryWithCondition(t *testing.T) {
 		}, func(err error) bool {
 			return err != nil && err.Error() == "temporary error"
 		}, Initial(10*time.Millisecond))
-		
+
 		if err != nil {
 			t.Errorf("expected success, got error: %v", err)
 		}
-		
+
 		if attempts != 3 {
 			t.Errorf("expected 3 attempts, got %d", attempts)
 		}
@@ -147,7 +147,7 @@ func TestHTTPRetryTransport(t *testing.T) {
 		_, _ = w.Write([]byte("success"))
 	}))
 	defer server.Close()
-	
+
 	client := &http.Client{
 		Transport: &HTTPRetryTransport{
 			Options: []Option{
@@ -156,22 +156,22 @@ func TestHTTPRetryTransport(t *testing.T) {
 			},
 		},
 	}
-	
+
 	resp, err := client.Get(server.URL)
 	if err != nil {
 		t.Fatalf("expected success, got error: %v", err)
 	}
 	defer func() { _ = resp.Body.Close() }()
-	
+
 	if resp.StatusCode != http.StatusOK {
 		t.Errorf("expected status 200, got %d", resp.StatusCode)
 	}
-	
+
 	body, _ := io.ReadAll(resp.Body)
 	if string(body) != "success" {
 		t.Errorf("expected body 'success', got '%s'", body)
 	}
-	
+
 	if attempts != 3 {
 		t.Errorf("expected 3 attempts, got %d", attempts)
 	}
@@ -188,22 +188,22 @@ func TestNewHTTPClient(t *testing.T) {
 		w.WriteHeader(http.StatusOK)
 	}))
 	defer server.Close()
-	
+
 	client := NewHTTPClient(
 		Initial(10*time.Millisecond),
 		Tries(3),
 	)
-	
+
 	resp, err := client.Get(server.URL)
 	if err != nil {
 		t.Fatalf("expected success, got error: %v", err)
 	}
 	defer func() { _ = resp.Body.Close() }()
-	
+
 	if resp.StatusCode != http.StatusOK {
 		t.Errorf("expected status 200, got %d", resp.StatusCode)
 	}
-	
+
 	if attempts != 2 {
 		t.Errorf("expected 2 attempts, got %d", attempts)
 	}
@@ -221,23 +221,23 @@ func TestHTTPDo(t *testing.T) {
 		_, _ = w.Write([]byte("done"))
 	}))
 	defer server.Close()
-	
+
 	req, err := http.NewRequest("GET", server.URL, nil)
 	if err != nil {
 		t.Fatalf("failed to create request: %v", err)
 	}
-	
+
 	resp, err := HTTPDo(req, nil, Initial(10*time.Millisecond))
 	if err != nil {
 		t.Fatalf("expected success, got error: %v", err)
 	}
 	defer func() { _ = resp.Body.Close() }()
-	
+
 	if resp.StatusCode != http.StatusOK {
 		t.Errorf("expected status 200, got %d", resp.StatusCode)
 	}
-	
+
 	if attempts != 2 {
 		t.Errorf("expected 2 attempts, got %d", attempts)
 	}
-}
+}