24676 Commits

Author SHA1 Message Date
Maxim Belkin
15dbb0be58 utils/ruby.sh: simplify and fix Ruby-related logic
General:
- Rename `unusable_ruby` to `need_vendored_ruby` (due to code changes).

**`setup-ruby-path`** function:
- Move `-z "$HOMEBREW_RUBY_PATH"` and `-n "$HOMEBREW_FORCE_VENDOR_RUBY"` checks to `need_vendored_ruby`.

**`need_vendored_ruby`** function:
- Check `HOMEBREW_FORCE_VENDOR_RUBY` first so that it's respected even
  on Macs that are "new enough" (`HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH` is set).
- Don't check `-n $HOMEBREW_RUBY_PATH` because it is implicitly tested
  by `test_ruby`.
- Remove (now-) redundant `-z $HOMEBREW_FORCE_VENDOR_RUBY` check as it is
  tested earlier in the conditional.
2020-12-08 18:05:28 -06:00
Markus Reiter
83b774d61f
Merge pull request #9436 from reitermarkus/audit-appcast
Reuse `curl_http_content_headers_and_checksum` for appcast audit.
2020-12-09 00:31:48 +01:00
Markus Reiter
7ed7319685
Merge pull request #9457 from RandomDSdevel/prevent-running-additional-CI-jobs-on-user-forks
workflows:  Prevent Running Additional CI Jobs on User Forks
2020-12-09 00:31:17 +01:00
Markus Reiter
9e0a54fd37 Reuse curl_http_content_headers_and_checksum for appcast audit. 2020-12-08 23:29:01 +01:00
Maxim Belkin
ddfd499c20
Merge pull request #9465 from MikeMcQuaid/ruby-version
Fix macOS Ruby version handling
2020-12-08 14:42:12 -06:00
Markus Reiter
fa52eab58e
Merge pull request #9450 from reitermarkus/url-unversioned
Add `unversioned?` method to `Cask::URL`.
2020-12-08 19:48:37 +01:00
Seeker
305fbdd15c
Merge pull request #9438 from SeekingMeaning/software-spec-os
software_spec: add on_macos/on_linux to SoftwareSpec
2020-12-08 10:37:47 -08:00
Seeker
1d791a7a04
Merge pull request #9421 from SeekingMeaning/pour-bottle-os
software_spec: add on_macos/on_linux to PourBottleCheck
2020-12-08 09:37:46 -08:00
Mike McQuaid
f7d72ae77c
ruby.sh: don't test ruby on macOS.
Instead defer to the `HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH`
variable.
2020-12-08 17:23:06 +00:00
Mike McQuaid
9b4a7856ac
Revert "RbConfig: fix broken MacOS SDK paths"
This reverts commit 11445e0f3edf29ee64081c5a05b5257d9b5ccdd9.
2020-12-08 17:14:00 +00:00
Mike McQuaid
949095c247
Merge pull request #9425 from maxim-belkin/cmd-info-bottled-other-prefix
cmd/info.rb: correctly check whether the formula is bottled
2020-12-08 17:11:13 +00:00
Seeker
16270ba185 software_spec: add on_macos/on_linux to SoftwareSpec 2020-12-08 08:47:08 -08:00
Seeker
509ab86ece software_spec: add on_macos/on_linux to PourBottleCheck 2020-12-08 08:43:11 -08:00
Seeker
a0c0c4ea2a
Merge pull request #9439 from SeekingMeaning/os-specifiable
extend: add on_os (for on_macos/on_linux)
2020-12-08 08:38:03 -08:00
Maxim Belkin
44cdb0f66c
info.rb: correctly check if the formula is bottled
Co-authored-by: Mike McQuaid <mike@mikemcquaid.com>
2020-12-08 10:26:07 -06:00
FX Coudert
b2aad180fd
Merge pull request #9461 from fxcoudert/revert
Revert "Fix `:arm64_big_sur` bottle ordering."
2020-12-08 16:16:37 +01:00
Jonathan Chang
0a13dfad22
Merge pull request #9433 from jonchang/widen-type-append
ENV/shared: widen type for append_path
2020-12-09 01:07:15 +11:00
Francois-Xavier Coudert
399cc56d03 Revert "Fix :arm64_big_sur bottle ordering."
This reverts commit 66d1b929a5b134ee93caf9237e7074a195c1b523.
2020-12-08 13:00:22 +01:00
Jonathan Chang
1b6fb8f460 ENV/shared: widen type 2020-12-08 20:54:10 +11:00
Markus Reiter
3fc8c703f2
Merge pull request #9456 from reitermarkus/bump-unversioned-casks
Fix wrong version mapping in `bump-unversioned-casks`.
2020-12-08 01:56:01 +01:00
Bryce Glover
39bdb54d2d [.github/workflows/tests.yml] jobs.test-everything: Don't run on user forks. 2020-12-07 19:31:24 -05:00
Bryce Glover
94d68404db [.github/workflows/tests.yml] jobs.tap-syntax: Don't run on user forks. 2020-12-07 19:31:24 -05:00
Bryce Glover
ce11d63ca8 [.github/workflows/docker.yml] jobs.ubuntu: Don't run on user forks. 2020-12-07 19:31:24 -05:00
Misty De Meo
08be577d5f
Merge pull request #9452 from mistydemeo/ruby_fix_up_broken_system_headers
RbConfig: fix broken MacOS SDK paths
2020-12-07 16:18:12 -08:00
Markus Reiter
1c2a31e224 Allow passing individual casks to bump-unversioned-casks for debugging. 2020-12-08 01:03:39 +01:00
Markus Reiter
05b496194a Fix version mapping. 2020-12-08 01:03:33 +01:00
Markus Reiter
e416668a25
Merge pull request #9423 from reitermarkus/bump-unversioned-casks
Add `bump-unversioned-casks` command.
2020-12-08 00:19:37 +01:00
Markus Reiter
73440797ef Add bump_unversioned_cask helper method. 2020-12-07 23:03:47 +01:00
Markus Reiter
c6876ba65c Add UnversionedCaskChecker helper class. 2020-12-07 23:03:47 +01:00
Markus Reiter
3b524a04c2 Output PKG contents if no version can be found. 2020-12-07 23:03:47 +01:00
Markus Reiter
d6f30a4bc1 Handle formatted versions ending with build version. 2020-12-07 23:03:47 +01:00
Markus Reiter
96bbf1ac15 Show contained files of PKGs when version detection fails. 2020-12-07 23:03:47 +01:00
Markus Reiter
4f3bfd1d58 Improve handling of short_version starting with version. 2020-12-07 23:03:47 +01:00
Markus Reiter
91ce799fe2 Ignore empty version strings. 2020-12-07 23:03:47 +01:00
Markus Reiter
933499089c Add test for decide_between_versions. 2020-12-07 23:03:47 +01:00
Markus Reiter
6d21df2c8b Always choose longer version in correct format. 2020-12-07 23:03:47 +01:00
Markus Reiter
bf46814ddd Skip casks before extracting. 2020-12-07 23:03:47 +01:00
Markus Reiter
a3182a6386 Extract package into new temporary directory. 2020-12-07 23:03:47 +01:00
Markus Reiter
ef1ea75c08 Add support for single-package casks. 2020-12-07 23:03:47 +01:00
Markus Reiter
2157a71a68 Never exit with failure. 2020-12-07 23:03:47 +01:00
Markus Reiter
ffebf0da5f Update check_time even if time and file size didn't change. 2020-12-07 23:03:47 +01:00
Markus Reiter
0a54169fa6 Change limit to minutes. 2020-12-07 23:03:47 +01:00
Markus Reiter
b57a448f2a Add bump-unversioned-casks command. 2020-12-07 23:03:47 +01:00
Markus Reiter
76a3c0338b Add unversioned? method to Cask::URL. 2020-12-07 21:40:47 +01:00
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
Seeker
a2af19360b extend: add on_os (for on_macos/on_linux) 2020-12-07 10:36:51 -08:00
Misty De Meo
11445e0f3e RbConfig: fix broken MacOS SDK paths 2020-12-07 10:33:56 -08: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