Merge branch 'master' into fb-swift-versions

Author: DavidKorczynski

.github/workflows/check_base_os.yml

@@ -35,7 +35,7 @@ jobs:
         run: |
           # Get the list of changed files compared to the target branch
           # and filter for unique directories under 'projects/'.
-          CHANGED_DIRS=$(git diff --name-only ${{ github.base_ref }} ${{ github.head_ref }} | \
+          CHANGED_DIRS=$(git diff --name-only ${GITHUB_BASE_REF} ${GITHUB_HEAD_REF} | \
             grep '^projects/' | \
             xargs -n 1 dirname | \
             sort -u)
@@ -53,9 +53,11 @@ jobs:
         if: steps.changed-projects.outputs.changed_dirs != ''
         run: |
           EXIT_CODE=0
-          for project_dir in ${{ steps.changed-projects.outputs.changed_dirs }};
+          for project_dir in ${STEPS_CHANGED_PROJECTS_OUTPUTS_CHANGED_DIRS};
           do
             echo "--- Checking ${project_dir} ---"
             python3 infra/ci/check_base_os.py "${project_dir}" || EXIT_CODE=$?
           done
           exit $EXIT_CODE
+        env:
+          STEPS_CHANGED_PROJECTS_OUTPUTS_CHANGED_DIRS: ${{ steps.changed-projects.outputs.changed_dirs }}

infra/base-images/base-builder/compile_native_go_fuzzer_v2

@@ -23,17 +23,25 @@ tags="-tags gofuzz"
 # Get absolute path.
 abs_file_dir=$(go list $tags -f {{.Dir}} $path)
 
-# TODO(adamkorcz): Get rid of "-r" flag here.
-export fuzzer_filename=$(grep -r -l --include='*.go' -s "$function" "${abs_file_dir}")
+# Find the file containing the fuzzer function definition.
+# Search for the actual function signature with testing.F to avoid false matches
+# in files that only reference the function name (e.g., in comments or helper functions).
+export fuzzer_filename=$(grep -r -l --include='*.go' "func ${function}(.*testing\.F" "${abs_file_dir}")
 
 # Import build_native_go_fuzzer
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/go_utils.sh"
 
-# Test if file contains a line with "func $function" and "testing.F".
-if [ $(grep -r "func $function" $fuzzer_filename | grep "testing.F" | wc -l) -eq 1 ]
+# Verify we found exactly one file with the fuzzer function.
+file_count=$(echo "$fuzzer_filename" | wc -w)
+if [ "$file_count" -eq 1 ] && [ -n "$fuzzer_filename" ] && [ -f "$fuzzer_filename" ]
 then
   build_native_go_fuzzer $fuzzer $function $abs_file_dir $path
+elif [ "$file_count" -gt 1 ]
+then
+  echo "Error: Found multiple files with func ${function}(f *testing.F):"
+  echo "$fuzzer_filename"
+  exit 1
 else
   echo "Could not find the function: func ${function}(f *testing.F)"
 fi

infra/base-images/base-builder/indexer/clang_wrapper.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2025 Google LLC.
+# Copyright 2026 Google LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

infra/base-images/base-builder/indexer/clang_wrapper_test.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2025 Google LLC.
+# Copyright 2026 Google LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

infra/base-images/base-builder/indexer/coverage.cc

@@ -1,4 +1,4 @@
-// Copyright 2025 Google LLC.
+// Copyright 2026 Google LLC.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

infra/base-images/base-builder/indexer/dwarf_info.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2025 Google LLC.
+# Copyright 2026 Google LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

infra/base-images/base-builder/indexer/dwarf_info_diff.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2025 Google LLC.
+# Copyright 2026 Google LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

infra/base-images/base-builder/indexer/fuzzing_engine.cc

@@ -1,4 +1,4 @@
-// Copyright 2025 Google LLC.
+// Copyright 2026 Google LLC.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

infra/base-images/base-builder/indexer/index_build.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2025 Google LLC.
+# Copyright 2026 Google LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

infra/base-images/base-builder/indexer/index_build_test.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2025 Google LLC.
+# Copyright 2026 Google LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.