Avoid putting -repo_config after directories

.bazelci/presubmit.yml

@@ -22,8 +22,10 @@ tasks:
     working_directory: tests/bcr
     shell_commands:
     # Regenerate the BUILD file for the test module using Gazelle.
+    # Also verify -repo_config are generated correctly in gazelle.bash
     - rm pkg/BUILD.bazel
-    - bazel run //:gazelle
+    - bazel run //:gazelle -- update pkg
+    - bazel run //:gazelle -- pkg
     build_flags:
     - "--allow_yanked_versions=all"
     test_flags:

internal/gazelle.bash.in

@@ -62,12 +62,18 @@ function set_goroot {
 
 # If arguments were provided on the command line, either replace or augment
 # the generated args.
-if [ "${1-}" = "-args" ]; then
-  shift
-  ARGS+=("$@")
-elif [ $# -ne 0 ]; then
-  ARGS=("$@")
-fi
+case "${1-}" in
+  "fix" | "update" | "help" | "update-repos")
+    ARGS=("$@")
+    ;;
+  "-args")
+    shift
+    ARGS+=("$@")
+    ;;
+  *)
+    ARGS+=("$@")
+    ;;
+esac
 
 # Invoke Gazelle.
 # Note that we don't change directories first; if we did, Gazelle wouldn't be
@@ -100,7 +106,7 @@ fi
 # the definitions of go_repository rules from. Instead, we pass the path to
 # the repo config file as a flag.
 if [[ "${is_fix_or_update:-}" == "true"  ]] && [[ -n $REPO_CONFIG_SHORT_PATH ]]; then
-  ARGS+=("-repo_config" "$(find_runfile "$REPO_CONFIG_SHORT_PATH")")
+  ARGS=("${ARGS[0]}" "-repo_config" "$(find_runfile "$REPO_CONFIG_SHORT_PATH")" "${ARGS[@]:1}")
 fi
 
 "$gazelle_short_path" "${ARGS[@]}"

tests/bcr/.bazelversion

@@ -1 +1 @@
-6.0.0
+6.2.0