Michka Popoff
ff28d7c69b
Merge pull request #9365 from iMichka/merge-test1
...
bottle: add tests for json merging
2020-12-07 21:15:47 +01:00
Michka Popoff
d768b6649a
bottle: add tests for json merging
...
- Extract the json reading from the json merging: it makes the code hard to understand.
This helps for the separation of concerns: the jsons are read in one method;
and merged in a second one
- Added a first test to check the merge function
No change in behaviour was done, this change is just there to increase code coverage
and to prepare for #9315
2020-12-07 19:58:49 +01:00
Mike McQuaid
20af7ee11f
Merge pull request #9448 from MikeMcQuaid/bottle_checksum_sorting
...
software_spec: make bottle sorting stable.
2020-12-07 16:26:43 +00:00
Mike McQuaid
f5f50feebc
Merge pull request #9447 from MikeMcQuaid/no-shallow-clone-clarify
...
cmd/update: improve shallow clone message.
2020-12-07 16:05:17 +00:00
Mike McQuaid
161cbf1074
Merge pull request #9446 from MikeMcQuaid/dispatch_build_bottle_arm_fix
...
dev-cmd/dispatch-build-bottle: remove testing code.
2020-12-07 16:05:00 +00:00
Mike McQuaid
a5bd7cccf1
software_spec: make bottle sorting stable.
...
As `:arm64_big_sur` and `:big_sur` equated to the same version: their
sorting was not consistent. Instead, suffix the tag and use that for
sorting so `:big_sur` is always before `:arm64_big_sur`.
2020-12-07 15:43:44 +00:00
Markus Reiter
9412c86856
Merge pull request #9440 from Homebrew/dependabot/bundler/docs/html-proofer-3.17.4
...
build(deps-dev): bump html-proofer from 3.17.3 to 3.17.4 in /docs
2020-12-07 16:37:26 +01:00
Markus Reiter
57250ecdf0
Merge pull request #9441 from Homebrew/dependabot/bundler/Library/Homebrew/sorbet-0.5.6134
...
build(deps): bump sorbet from 0.5.6130 to 0.5.6134 in /Library/Homebrew
2020-12-07 16:37:02 +01:00
Mike McQuaid
9d90ef29eb
cmd/update: improve shallow clone message.
2020-12-07 15:23:08 +00:00
Mike McQuaid
3aeaf51538
Merge pull request #9445 from MikeMcQuaid/diagnostic-exist-writable
...
diagnostic: don't complain about creatable directories that don't exist.
2020-12-07 15:12:23 +00:00
Mike McQuaid
532864b0ef
dev-cmd/dispatch-build-bottle: remove testing code.
...
This was accidentally merged in https://github.com/Homebrew/brew/pull/9444 .
2020-12-07 14:42:00 +00:00
BrewTestBot
e51e0685b1
Update RBI files for sorbet.
2020-12-07 14:41:14 +00:00
BrewTestBot
a90bb733af
brew vendor-gems: commit updates.
2020-12-07 14:40:28 +00:00
dependabot[bot]
229cbb0ef3
build(deps): bump sorbet from 0.5.6130 to 0.5.6134 in /Library/Homebrew
...
Bumps [sorbet](https://github.com/sorbet/sorbet ) from 0.5.6130 to 0.5.6134.
- [Release notes](https://github.com/sorbet/sorbet/releases )
- [Commits](https://github.com/sorbet/sorbet/commits )
Signed-off-by: dependabot[bot] <support@github.com>
2020-12-07 14:34:54 +00:00
dependabot[bot]
dcbdb9563a
build(deps-dev): bump html-proofer from 3.17.3 to 3.17.4 in /docs
...
Bumps [html-proofer](https://github.com/gjtorikian/html-proofer ) from 3.17.3 to 3.17.4.
- [Release notes](https://github.com/gjtorikian/html-proofer/releases )
- [Commits](https://github.com/gjtorikian/html-proofer/compare/v3.17.3...v3.17.4 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-12-07 14:34:00 +00:00
Mike McQuaid
b751742dfc
diagnostic: don't complain about creatable directories that don't exist.
...
If you can write to `HOMEBREW_PREFIX` (which isn't the case for
`/usr/local` on newer macOSs) then don't complain about these
directories not existing.
2020-12-07 14:32:56 +00:00
Mike McQuaid
59be0ba888
Merge pull request #9444 from MikeMcQuaid/dispatch_build_bottle_arm
...
dev-cmd/dispatch-build-bottle: set ARM labels.
2020-12-07 13:47:07 +00:00
Mike McQuaid
09cca671bd
dev-cmd/dispatch-build-bottle: set ARM labels.
...
Set the label properly for ARM.
Tested with inputs `11-arm` and `arm64_big_sur`.
Fixes https://github.com/Homebrew/brew/issues/9434
2020-12-07 13:20:01 +00:00
Mike McQuaid
62de53a515
Merge pull request #9443 from MikeMcQuaid/arm64_big_sur_bottle_ordering
...
Fix `:arm64_big_sur` bottle ordering.
2020-12-07 12:37:41 +00:00
Mike McQuaid
cf1e4fbcc3
Merge pull request #9442 from MikeMcQuaid/catalina-ruby-fix
...
brew.sh: don't allow system Ruby on Catalina.
2020-12-07 12:19:45 +00:00
Mike McQuaid
ed7df8f99d
Merge pull request #9381 from nandahkrishna/github-latest
...
livecheck: add GithubLatest strategy
2020-12-07 12:14:49 +00:00
Mike McQuaid
66d1b929a5
Fix :arm64_big_sur
bottle ordering.
...
This wasn't being parsed correctly so was being put below the Linux
bottle which is less readable, less intuitive and will cause a bunch
of merge conflicts.
2020-12-07 12:09:29 +00:00
Mike McQuaid
179459347a
brew.sh: don't allow system Ruby on Catalina.
...
It's (far) too broken for our purposes.
Fixes https://github.com/Homebrew/brew/issues/9410
2020-12-07 11:52:44 +00:00
Mike McQuaid
fa2f991b38
Merge pull request #9415 from MikeMcQuaid/consolidate_macos_tests
...
workflows/tests: consolidate macOS tests.
2020-12-07 11:50:10 +00:00
Jonathan Chang
24f7898606
Merge pull request #9336 from jonchang/refactor-git-extensions
...
git_extensions: refactor and delete redundant functions
2020-12-06 15:55:05 +11:00
Jonathan Chang
8b206dfa33
git_extensions: move commit_message from utils/git
2020-12-06 14:33:23 +11:00
Jonathan Chang
92d3eda914
git_extensions: move origin_branch from utils/git
2020-12-06 14:33:23 +11:00
Jonathan Chang
d802b3755a
utils/git: remove redundant current_branch
2020-12-06 14:33:23 +11:00
Jonathan Chang
5bda84b594
dev-cmd/pr-pull: use git_extensions
2020-12-06 14:33:23 +11:00
Jonathan Chang
75be0ca4d0
git_repository: add type signatures and comments
2020-12-06 14:33:23 +11:00
Markus Reiter
596b4f6278
Merge pull request #9431 from RandomDSdevel/restore-semantically-significant-indentation-lost-accidentally-in-PR-9398
...
[Library/Homebrew/cli/named_args.rb] `to_formulae_to_casks()`: Reasssociate its `rescue` Block with the Correct Enclosing Scope
2020-12-06 01:55:57 +01:00
Bryce Glover
c237223e15
[Library/Homebrew/cli/named_args.rb] to_formulae_to_casks()
: Reassociate its
...
`rescue` block with the right enclosing scope.
PR #9398 accidentally removed some semantically significant indentation in
this function, thus inadvertently kicking the `rescue` block inside out to func-
tion scope, when it moved its code further up in the file. This may well not
confuse a Ruby interpreter, but it could trip human readers up. Compensate and
correct the overlooked offending oversight and potential refactoring mistake by
restoring only that indentation, leaving the function in its new location.
Refs #9398 .
2020-12-05 16:34:55 -05:00
FX Coudert
f901b57bb5
Merge pull request #9418 from fxcoudert/rosetta2
...
brew: re-exec under native arch if requested
2020-12-05 19:53:31 +01:00
Sam Ford
28bfa0c93f
GithubLatest: Rework documentation comments
2020-12-05 11:53:50 -05:00
Sam Ford
524272aed0
Livecheck: Rework non-positive PRIORITY handling
2020-12-05 11:49:47 -05:00
Sam Ford
7ef88f1966
Livecheck: Skip URL processing for GithubLatest
2020-12-05 11:44:28 -05:00
Sam Ford
e37da96341
GithubLatest: Align test URL with example
2020-12-05 11:40:08 -05:00
nandahkrishna
d173b57c42
github_latest: modify strategy and tests
2020-12-05 20:37:28 +05:30
nandahkrishna
f96b8e7138
livecheck: add GithubLatest strategy
2020-12-05 20:37:27 +05:30
Markus Reiter
1834a33d08
Merge pull request #9398 from reitermarkus/cask-tap
...
Ensure default cask tap is installed on `CaskUnavailableError`.
2020-12-05 04:47:21 +01:00
Markus Reiter
9649ef975c
Only install default cask tap automatically on macOS.
2020-12-05 03:39:01 +01:00
Markus Reiter
e0aa934219
Ensure default cask tap is installed on CaskUnavailableError
.
2020-12-05 03:25:58 +01:00
Steve Peters
7e3e86eb41
Merge pull request #9370 from scpeters/ruby-e_testball_f_path_test
...
Test for `brew ruby -e 'puts "testball".f.path'`
2020-12-04 13:37:04 -08:00
Rylan Polster
20ee566165
Merge pull request #9411 from Rylan12/remove-tap-list-for-macos
...
Remove style exceptions for ProvidedByMacos and UsesFromMacos
2020-12-04 16:22:26 -05:00
Steve Peters
f4e42191d0
Add comment about :needs_linux
...
Co-authored-by: Mike McQuaid <mike@mikemcquaid.com>
2020-12-04 09:10:58 -08:00
Francois-Xavier Coudert
961f4cc14f
brew: re-exec under native arch if requested
2020-12-04 18:03:24 +01:00
Mike McQuaid
284d75afd4
Merge pull request #9160 from claui/apple-m1-cpu-family
...
Add CPU family for M1, remove Intel Arrandale
2020-12-04 16:47:09 +00:00
Claudia
564e21c382
Update CPU families from current machine.h
2020-12-04 16:21:02 +01:00
Claudia
2a197af076
Add CPU family for Apple’s M1 SoC
...
According to reports, XNU’s CPU family identifier previously used for
the Westmere family (which Homebrew mislabels as the Arrandale family)
is now being reused for one of Apple’s M1 SoC models.
Resolve the conflict by splitting the list of CPU families and adding a
microarchitecture check.
Sources for the values:
- https://github.com/Homebrew/brew/issues/7857#issuecomment-728739049
- https://en.wikipedia.org/wiki/Comparison_of_ARMv8-A_cores
- Direct messages
2020-12-04 16:20:53 +01:00
Markus Reiter
de1afcbfc5
Merge pull request #9409 from Homebrew/dependabot/bundler/Library/Homebrew/rspec-sorbet-1.8.0
...
build(deps): bump rspec-sorbet from 1.7.0 to 1.8.0 in /Library/Homebrew
2020-12-04 13:15:24 +01:00