Continuing the joy of submodule URL changes #164
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Should hopefully ensure that the sync succeeds.
|
OK, so in fact contrary to what I said in the ocurrent PR, the same thing does indeed happen in ocluster - the git cache is left in an inconsistent state w.r.t. submodules, as the files which are This PR will fix that for clones which aren't already broken - we possibly do something a little more clever with checking the status of the submodules. |
tmcgilchrist
added a commit
to tmcgilchrist/opam-repository
that referenced
this pull request
Nov 9, 2022
CHANGES: - Update OBuilder to pull in Windows prereqs (@MisterDA ocurrent/ocluster#196, reviewed by @tmcgilchrist) - Worker pool capacity metric (@mtelvers ocurrent/ocluster#195, reviewed by @talex5) - Update Ocluster to be macOS capable (@patricoferris ocurrent/ocluster#152, reviewed by @tmcgilchrist) - Use rsync-hardlink from OBuilder rsync store (@MisterDA ocurrent/ocluster#189, reviewed by @tmcgilchrist) - Various Dune 3 fixes (@MisterDA ocurrent/ocluster#187, reviewed by @talex5) - Switch from Debian to Ubuntu for Worker Builds (@mtelvers ocurrent/ocluster#185, reviewed by @dra27) - Update to Prometheus 1.2 (@mtelvers ocurrent/ocluster#183, reviewed by @MisterDA) - Default to GitLab merge-requests refspecs (@MisterDA ocurrent/ocluster#180, reviewed by @tmcgilchrist) - GitLab: allow fetching merge-requests from remote origin (@MisterDA ocurrent/ocluster#175, reviewed by @tmcgilchrist) - Updated Dockerfile* and .dockerignore (@mtelvers ocurrent/ocluster#178, reviewed by @tmcgilchrist and @MisterDA) - Upgrade lwt to 5.5.0 (@maiste ocurrent/ocluster#171 ocurrent/ocluster#181, reviewed by @dra27) - Added --terse option to ocluster-admin-show and added new command ocluster-admin-exec (@mtelvers ocurrent/ocluster#165, reviewed by @tmcgilchrist and @dra27) - Support custom jobs, adds custom job specifications to the cluster API. (@patricoferris ocurrent/ocluster#156, reviewed by @talex5) - Continuing the joy of submodule URL changes (@dra27 ocurrent/ocluster#164) - Update ocaml/opam-repository SHA includes tar-unix.2.0.1 (@mtelvers ocurrent/ocluster#161, reviewed by @dra27) - Run git submodule update when resetting the git clone (@MisterDA ocurrent/ocluster#163, reviewed by @tmcgilchrist) - Cmdliner.1.1.0 support (@MisterDA ocurrent/ocluster#160) - Explicitly set confirmation levels to allow for manually triggered jobs. (@tmcgilchrist ocurrent/ocluster#159, reviewed by @TheLortex) - Merge Obuilder with rsync store (@MisterDA ocurrent/ocluster#155, reviewed by @talex5) - Sqlite3 remove usage of "FALSE" for compatibility with older versions (@art-w ocurrent/ocluster#150, reviewed by @talex5) - Revert adopting GNU tar format (@dra27 ocurrent/ocluster#148) - Update obuilder to latest (@mtelvers ocurrent/ocluster#147) - Fix deprecations in Fmt 0.8.10 (@tmcgilchrist ocurrent/ocluster#145) - Lwt_unix.yield was deprecated in favor of Lwt.pause (@MisterDA ocurrent/ocluster#142, reviewed by @dra27) - Remove runc build from Dockerfile.worker (@talex5 ocurrent/ocluster#140) - Add Windows support (@MisterDA ocurrent/ocluster#128, reviewed by @dra27 and @talex5) - Admin client: fix ref-counting on progress display (@talex5 ocurrent/ocluster#138) - Add --verbose to README examples (@talex5 ocurrent/ocluster#137) - Use --connect for the worker capability too (@talex5 ocurrent/ocluster#136) - Make free-space check work on Windows (@talex5 ocurrent/ocluster#134) - Support Fmt.cli and Logs.cli (@MisterDA ocurrent/ocluster#133, reviewed by @talex5) - Windows support prerequisites (@talex5 and @MisterDA ocurrent/ocluster#132) - Update to capnp-rpc 1.2 and fix connection handling (@talex5 ocurrent/ocluster#131) - Improve reporting of connection errors (@talex5 ocurrent/ocluster#130) - Depend on more current_* modules to build examples (@MisterDA ocurrent/ocluster#129, reviewed by @talex5) - Add ca-certificates to Dockerfile (@talex5 ocurrent/ocluster#127) - API to wait for a worker to drain, useful for scripts that need to wait for a worker to stop before continuing. (@talex5 ocurrent/ocluster#126) - Allow pausing/unpausing/forgetting unconnected workers (@talex5 ocurrent/ocluster#125) - Fix ref-leak when rejecting duplicate workers (@talex5 ocurrent/ocluster#124) - Improve handling of a worker's active state (@talex5 ocurrent/ocluster#123) - Report better error on duplicate worker registration (@talex5 ocurrent/ocluster#122) - Switch pool tests to expect tests (@talex5 ocurrent/ocluster#121) - Add timestamps to OBuilder logs (@talex5 ocurrent/ocluster#120) - Fix opam constraint on digestif (@kit-ty-kate ocurrent/ocluster#118, reviewed by @talex5) - Add support for secrets. Secrets are a way to transmit sensitive key-value pairs to workers, without having them displayed in any log files. (@TheLortex ocurrent/ocluster#116, reviewed by @talex5) - Add optional label to build_obuilder (@TheLortex ocurrent/ocluster#113, reviewed by @talex5)
dinosaure
pushed a commit
to tmcgilchrist/opam-repository
that referenced
this pull request
Dec 8, 2022
CHANGES: - Update OBuilder to pull in Windows prereqs (@MisterDA ocurrent/ocluster#196, reviewed by @tmcgilchrist) - Worker pool capacity metric (@mtelvers ocurrent/ocluster#195, reviewed by @talex5) - Update Ocluster to be macOS capable (@patricoferris ocurrent/ocluster#152, reviewed by @tmcgilchrist) - Use rsync-hardlink from OBuilder rsync store (@MisterDA ocurrent/ocluster#189, reviewed by @tmcgilchrist) - Various Dune 3 fixes (@MisterDA ocurrent/ocluster#187, reviewed by @talex5) - Switch from Debian to Ubuntu for Worker Builds (@mtelvers ocurrent/ocluster#185, reviewed by @dra27) - Update to Prometheus 1.2 (@mtelvers ocurrent/ocluster#183, reviewed by @MisterDA) - Default to GitLab merge-requests refspecs (@MisterDA ocurrent/ocluster#180, reviewed by @tmcgilchrist) - GitLab: allow fetching merge-requests from remote origin (@MisterDA ocurrent/ocluster#175, reviewed by @tmcgilchrist) - Updated Dockerfile* and .dockerignore (@mtelvers ocurrent/ocluster#178, reviewed by @tmcgilchrist and @MisterDA) - Upgrade lwt to 5.5.0 (@maiste ocurrent/ocluster#171 ocurrent/ocluster#181, reviewed by @dra27) - Added --terse option to ocluster-admin-show and added new command ocluster-admin-exec (@mtelvers ocurrent/ocluster#165, reviewed by @tmcgilchrist and @dra27) - Support custom jobs, adds custom job specifications to the cluster API. (@patricoferris ocurrent/ocluster#156, reviewed by @talex5) - Continuing the joy of submodule URL changes (@dra27 ocurrent/ocluster#164) - Update ocaml/opam-repository SHA includes tar-unix.2.0.1 (@mtelvers ocurrent/ocluster#161, reviewed by @dra27) - Run git submodule update when resetting the git clone (@MisterDA ocurrent/ocluster#163, reviewed by @tmcgilchrist) - Cmdliner.1.1.0 support (@MisterDA ocurrent/ocluster#160) - Explicitly set confirmation levels to allow for manually triggered jobs. (@tmcgilchrist ocurrent/ocluster#159, reviewed by @TheLortex) - Merge Obuilder with rsync store (@MisterDA ocurrent/ocluster#155, reviewed by @talex5) - Sqlite3 remove usage of "FALSE" for compatibility with older versions (@art-w ocurrent/ocluster#150, reviewed by @talex5) - Revert adopting GNU tar format (@dra27 ocurrent/ocluster#148) - Update obuilder to latest (@mtelvers ocurrent/ocluster#147) - Fix deprecations in Fmt 0.8.10 (@tmcgilchrist ocurrent/ocluster#145) - Lwt_unix.yield was deprecated in favor of Lwt.pause (@MisterDA ocurrent/ocluster#142, reviewed by @dra27) - Remove runc build from Dockerfile.worker (@talex5 ocurrent/ocluster#140) - Add Windows support (@MisterDA ocurrent/ocluster#128, reviewed by @dra27 and @talex5) - Admin client: fix ref-counting on progress display (@talex5 ocurrent/ocluster#138) - Add --verbose to README examples (@talex5 ocurrent/ocluster#137) - Use --connect for the worker capability too (@talex5 ocurrent/ocluster#136) - Make free-space check work on Windows (@talex5 ocurrent/ocluster#134) - Support Fmt.cli and Logs.cli (@MisterDA ocurrent/ocluster#133, reviewed by @talex5) - Windows support prerequisites (@talex5 and @MisterDA ocurrent/ocluster#132) - Update to capnp-rpc 1.2 and fix connection handling (@talex5 ocurrent/ocluster#131) - Improve reporting of connection errors (@talex5 ocurrent/ocluster#130) - Depend on more current_* modules to build examples (@MisterDA ocurrent/ocluster#129, reviewed by @talex5) - Add ca-certificates to Dockerfile (@talex5 ocurrent/ocluster#127) - API to wait for a worker to drain, useful for scripts that need to wait for a worker to stop before continuing. (@talex5 ocurrent/ocluster#126) - Allow pausing/unpausing/forgetting unconnected workers (@talex5 ocurrent/ocluster#125) - Fix ref-leak when rejecting duplicate workers (@talex5 ocurrent/ocluster#124) - Improve handling of a worker's active state (@talex5 ocurrent/ocluster#123) - Report better error on duplicate worker registration (@talex5 ocurrent/ocluster#122) - Switch pool tests to expect tests (@talex5 ocurrent/ocluster#121) - Add timestamps to OBuilder logs (@talex5 ocurrent/ocluster#120) - Fix opam constraint on digestif (@kit-ty-kate ocurrent/ocluster#118, reviewed by @talex5) - Add support for secrets. Secrets are a way to transmit sensitive key-value pairs to workers, without having them displayed in any log files. (@TheLortex ocurrent/ocluster#116, reviewed by @talex5) - Add optional label to build_obuilder (@TheLortex ocurrent/ocluster#113, reviewed by @talex5)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Continuing #163 (possibly) and with reference to the second commit in ocurrent/ocurrent#320, try updating submodules prior to reset. Should hopefully ensure that the sync succeeds.