Fix ci pipeline

jjti · Dec 27, 2023 · 3ffbd2e · 3ffbd2e
1 parent 2573a0a
commit 3ffbd2e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
-      - run: cd /tmp && go install github.com/jjti/go-spanlint@${{ env.version }} && spanlint -h
+      - run: cd /tmp && go install github.com/jjti/go-spanlint/cmd/spanlint@${{ env.version }} && spanlint -h
         env:
           version: ${{ env.GITHUB_EVENT_PULL_REQUEST_HEAD_SHA || env.GITHUB_REF_SLUG }}
 

diff --git a/spanlint.go b/spanlint.go
@@ -235,8 +235,7 @@ func missingSpanCalls(
 				switch n.(type) {
 				case *ast.FuncLit:
 					if len(stack) > 0 {
-						// return false // don't stray into nested functions
-						return true // don't stray into nested functions
+						return false // don't stray into nested functions
 					}
 				case nil:
 					stack = stack[:len(stack)-1] // pop

diff --git a/testdata/test.go b/testdata/test.go
@@ -132,6 +132,17 @@ func _() error {
 	return nil
 }
 
+func _() error {
+	_, span := otel.Tracer("foo").Start(context.Background(), "bar")
+	defer span.End()
+
+	if true {
+		return nil
+	}
+
+	return nil
+}
+
 func _() error {
 	_, span := otel.Tracer("foo").Start(context.Background(), "bar")
 	defer span.End()