Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[infra] Add --force flag to git submodule update in script. #19550

Merged
merged 1 commit into from
Jan 2, 2025

Conversation

ScottTodd
Copy link
Member

Context: #19538 (comment)

One workflow failed on a self-hosted runner after changing a submodule pin:

+ git submodule update --init --jobs 8 --depth 1 third_party/benchmark third_party/cpuinfo third_party/flatcc third_party/googletest third_party/hip-build-deps third_party/hsa-runtime-headers third_party/musl third_party/spirv_cross third_party/tracy third_party/vulkan_headers third_party/webgpu-headers
From https://github.com/google/benchmark
 + c19cfee...f4f93b5 main       -> origin/main  (forced update)
From https://github.com/google/benchmark
 * branch            99bdb2127d1fa1cff444bbefb814e105c7d20c45 -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by checkout:
	.github/workflows/pre-commit.yml
	.github/workflows/test_bindings.yml
       ...

Please commit your changes or stash them before you switch branches.
Aborting
fatal: Unable to checkout '99bdb2127d1fa1cff444bbefb814e105c7d20c45' in submodule path 'third_party/benchmark'

This adds the --force flag to try proceeding anyways. Anyone calling this script is already delegating the submodule update behavior to it.

@ScottTodd ScottTodd added the infrastructure Relating to build systems, CI, or testing label Dec 20, 2024
@ScottTodd ScottTodd requested review from benvanik and marbre December 20, 2024 23:59
@ScottTodd ScottTodd marked this pull request as ready for review December 20, 2024 23:59
@ScottTodd ScottTodd merged commit fa325c5 into iree-org:main Jan 2, 2025
37 checks passed
@ScottTodd ScottTodd deleted the git-submodules-runtime-force branch January 2, 2025 16:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
infrastructure Relating to build systems, CI, or testing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants