github_runner_matrix: deploy new x86_64 runner when required #18363
+22
−1
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
MikeMcQuaid
reviewed
Sep 20, 2024
Comment on lines
+132
to
+147
| NEW_INTEL_MACOS_MUST_BUILD_FORMULAE = %w[pkg-config pkgconf].freeze | ||
|
|
||
| sig { returns(T::Boolean) } | ||
| def deploy_new_x86_64_runner? | ||
| return true if @testing_formulae.any? { |f| NEW_INTEL_MACOS_MUST_BUILD_FORMULAE.include?(f.name) } | ||
| return true if @testing_formulae.any? { |f| f.formula.class.pour_bottle_only_if == :clt_installed } | ||
|
|
||
| Formula.all.any? do |formula| | ||
| non_test_dependencies = Dependency.expand(formula, cache_key: "determine-test-runners") do |_, dependency| | ||
| Dependency.prune if dependency.test? | ||
| end | ||
| next false if non_test_dependencies.none? { |dep| @testing_formulae.map(&:name).include?(dep.name) } | ||
|
|
||
| formula.class.pour_bottle_only_if == :clt_installed | ||
| end | ||
| end |
There was a problem hiding this comment.
As mentioned before: I'd love to see this be a temporary stop-gap while we add a DSL. I think this needs some pretty hefty amounts of comments until then explaining why these particular formulae need to be doing what they are doing here.
| return true if @testing_formulae.any? { |f| NEW_INTEL_MACOS_MUST_BUILD_FORMULAE.include?(f.name) } | ||
| return true if @testing_formulae.any? { |f| f.formula.class.pour_bottle_only_if == :clt_installed } | ||
|
|
||
| Formula.all.any? do |formula| |
There was a problem hiding this comment.
can this instead use e.g. the relevant tap(s) instead of reading all formulae unconditionally here?
| # `#deploy_new_x86_64_runner?` is expensive, so: | ||
| # - avoid calling it if we don't have to | ||
| # - cache the result to a variable to avoid calling it multiple times | ||
| deploy_new_x86_64_runner = @all_supported || deploy_new_x86_64_runner? |
There was a problem hiding this comment.
If it's slow: be worth putting this in the loop lazily evaluated as late as possible and memoized so that we can avoid more cases where it might not need to be called at all e.g. for the last possible next
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.
brew stylewith your changes locally?brew typecheckwith your changes locally?brew testswith your changes locally?Closes #18356.