diff --git a/ops/ci/onboard_and_verify.sh b/ops/ci/onboard_and_verify.sh index ca8e5a5..c688dce 100755 --- a/ops/ci/onboard_and_verify.sh +++ b/ops/ci/onboard_and_verify.sh @@ -32,6 +32,19 @@ USAGE ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)" cd "$ROOT_DIR" +run_go() { + if command -v go >/dev/null 2>&1; then + go "$@" + return + fi + if command -v mise >/dev/null 2>&1; then + mise x -- go "$@" + return + fi + echo "ERROR: go not found (install go or mise)" >&2 + exit 1 +} + REPO="" REPO_DIR="" REF="main" @@ -118,10 +131,10 @@ runner_setup_args=(--apply --repo "$REPO" --labels "$LABELS" --runner-group "$RU if [[ -n "$RUNNER_NAME" ]]; then runner_setup_args+=(--name "$RUNNER_NAME") fi -go run ./cmd/runner_setup "${runner_setup_args[@]}" +run_go run ./cmd/runner_setup "${runner_setup_args[@]}" echo "OK: runner_health_start" -go run ./cmd/runner_health +run_go run ./cmd/runner_health OWNER="$(gh repo view "$REPO" --json owner --jq .owner.login)" echo "OK: set_variable SELF_HOSTED_OWNER=$OWNER" diff --git a/ops/ci/scaffold_verify_workflow.sh b/ops/ci/scaffold_verify_workflow.sh index 221b495..ac185b4 100755 --- a/ops/ci/scaffold_verify_workflow.sh +++ b/ops/ci/scaffold_verify_workflow.sh @@ -206,8 +206,17 @@ fi mkdir -p "$WORKFLOW_DIR" if [[ -f "$WORKFLOW_FILE" && "$FORCE" -ne 1 ]]; then - echo "ERROR: $WORKFLOW_FILE already exists (use --force to overwrite)" >&2 - exit 2 + echo "SKIP: $WORKFLOW_FILE already exists (use --force to overwrite)" + if [[ "$UPDATE_GITIGNORE" -eq 1 ]]; then + touch "$GITIGNORE_FILE" + for entry in ".local/" "out/" "cache/"; do + if ! grep -Fxq "$entry" "$GITIGNORE_FILE"; then + printf '%s\n' "$entry" >>"$GITIGNORE_FILE" + echo "OK: added to .gitignore: $entry" + fi + done + fi + exit 0 fi cp "$TMP_FILE" "$WORKFLOW_FILE"