Skip to content

Commit 6278ac1

Browse files
authored
Merge branch 'master' into cabal
2 parents 92832c2 + 0cd1e6c commit 6278ac1

File tree

153 files changed

+1009
-371
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+1009
-371
lines changed

.github/dependabot.yml

Lines changed: 49 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,68 +5,86 @@ updates:
55
directory: /
66
schedule:
77
interval: weekly
8+
day: "friday"
9+
time: "08:00"
10+
timezone: "Etc/UTC"
811
allow:
912
- dependency-type: all
10-
# The actions in triage-issues.yml are updated in the Homebrew/.github repo
11-
ignore:
12-
- dependency-name: actions/stale
1313
groups:
14-
artifacts:
14+
github-actions:
1515
patterns:
16-
- actions/*-artifact
17-
open-pull-requests-limit: 10
16+
- "*"
1817

1918
- package-ecosystem: bundler
20-
directory: /Library/Homebrew
19+
directories:
20+
- /
21+
- /Library/Homebrew
2122
schedule:
22-
interval: daily
23+
interval: weekly
24+
day: "friday"
25+
time: "08:00"
26+
timezone: "Etc/UTC"
2327
allow:
2428
- dependency-type: all
2529
groups:
26-
rspec:
27-
patterns:
28-
- "rspec*"
29-
sorbet:
30+
bundler:
3031
patterns:
31-
- "sorbet*"
32-
open-pull-requests-limit: 10
32+
- "*"
3333

3434
- package-ecosystem: npm
3535
directory: /
3636
schedule:
37-
interval: daily
37+
interval: weekly
38+
day: "friday"
39+
time: "08:00"
40+
timezone: "Etc/UTC"
3841
allow:
3942
- dependency-type: all
40-
open-pull-requests-limit: 10
43+
groups:
44+
npm:
45+
patterns:
46+
- "*"
4147

4248
- package-ecosystem: docker
4349
directory: /
4450
schedule:
45-
interval: daily
51+
interval: weekly
52+
day: "friday"
53+
time: "08:00"
54+
timezone: "Etc/UTC"
4655
allow:
4756
- dependency-type: all
48-
open-pull-requests-limit: 10
57+
groups:
58+
docker:
59+
patterns:
60+
- "*"
4961

5062
- package-ecosystem: devcontainers
5163
directory: /
5264
schedule:
53-
interval: daily
54-
allow:
55-
- dependency-type: all
56-
open-pull-requests-limit: 10
57-
58-
- package-ecosystem: pip
59-
directory: /
60-
schedule:
61-
interval: daily
65+
interval: weekly
66+
day: "friday"
67+
time: "08:00"
68+
timezone: "Etc/UTC"
6269
allow:
6370
- dependency-type: all
64-
open-pull-requests-limit: 10
71+
groups:
72+
devcontainers:
73+
patterns:
74+
- "*"
6575

6676
- package-ecosystem: pip
67-
directory: /Library/Homebrew/formula-analytics/
77+
directories:
78+
- /
79+
- /Library/Homebrew/formula-analytics/
6880
schedule:
69-
interval: daily
81+
interval: weekly
82+
day: "friday"
83+
time: "08:00"
84+
timezone: "Etc/UTC"
7085
allow:
7186
- dependency-type: all
72-
open-pull-requests-limit: 10
87+
groups:
88+
pip:
89+
patterns:
90+
- "*"

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
run: vale docs/
5353

5454
- name: Install Ruby
55-
uses: ruby/setup-ruby@1a0ff446f5856bdfec298b61a09727c860d9d480 # v1.240.0
55+
uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
5656
with:
5757
bundler-cache: true
5858
working-directory: docs

.github/workflows/pkg-installer.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -230,17 +230,15 @@ jobs:
230230
--password "${PKG_APPLE_ID_APP_SPECIFIC_PASSWORD}"
231231
--wait
232232

233-
- name: Install gh
234-
run: brew install gh
235-
236233
- name: Upload installer to GitHub release
237234
if: github.event_name == 'release'
238235
env:
239236
GH_TOKEN: ${{ github.token }}
240237
INSTALLER_PATH: ${{ needs.build.outputs.installer_path }}
241-
run: gh release upload --repo Homebrew/brew
242-
"${GITHUB_REF//refs\/tags\//}"
243-
"${INSTALLER_PATH}"
238+
run: |
239+
VERSION="${INSTALLER_PATH#Homebrew-}"
240+
VERSION="${VERSION%.pkg}"
241+
gh release upload --repo Homebrew/brew "${VERSION}" "${INSTALLER_PATH}"
244242
245243
issue:
246244
needs: [build, test, upload]

.github/workflows/rubydoc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
persist-credentials: false
4343

4444
- name: Install Ruby
45-
uses: ruby/setup-ruby@1a0ff446f5856bdfec298b61a09727c860d9d480 # v1.240.0
45+
uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
4646
with:
4747
bundler-cache: true
4848
working-directory: rubydoc

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ jobs:
335335
filenames=$(find Library/Homebrew/test/junit -name 'rspec*.xml' -print | tr '\n' ',')
336336
echo "filenames=${filenames%,}" >> "$GITHUB_OUTPUT"
337337
338-
- uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
338+
- uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
339339
with:
340340
working-directory: ${{ steps.set-up-homebrew.outputs.repository-path }}
341341
files: ${{ steps.junit_xml.outputs.filenames }}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@
164164
!/completions
165165
!/docs
166166
!/manpages
167+
!/CODEOWNERS
167168

168169
# Unignore our packaging files
169170
!/package
@@ -172,6 +173,7 @@
172173
# Ignore generated documentation site
173174
/docs/_site
174175
/docs/.jekyll-metadata
176+
/docs/tmp/.htmlproofer
175177
/docs/vendor
176178
/docs/Gemfile.lock
177179

CODEOWNERS

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Note that the naming of this file is incorrect for our case: these people do not "own" the provided files but are
2+
# people with write-access to this repository who wish to approve changes to these files.
3+
#
4+
# Their review is required to merge PRs that change these files.
5+
#
6+
# To be explicit: we will never accept changes to this file adding people from outside the Homebrew GitHub
7+
# organisation. If you are not a Homebrew maintainer: you do not personally "own" or "maintain" any files.
8+
#
9+
# Note: @Homebrew/plc does not have write-access to this repository, and therefore cannot be listed in this file.
10+
11+
docs/Support-Tiers.md @Homebrew/tsc @MikeMcQuaid

Library/.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ AllCops:
2626
Include:
2727
- "**/*.rbi"
2828
Exclude:
29-
- "Homebrew/sorbet/rbi/{dsl,gems}/**/*.rbi"
29+
- "Homebrew/sorbet/rbi/{annotations,dsl,gems}/**/*.rbi"
3030
- "Homebrew/sorbet/rbi/parser*.rbi"
3131
- "Homebrew/bin/*"
3232
- "Homebrew/vendor/**/*"

Library/Homebrew/Gemfile.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ GEM
104104
rubocop (~> 1.72, >= 1.72.1)
105105
rubocop-sorbet (0.10.0)
106106
rubocop (>= 1)
107-
ruby-lsp (0.23.20)
107+
ruby-lsp (0.23.21)
108108
language_server-protocol (~> 3.17.0)
109109
prism (>= 1.2, < 2.0)
110110
rbs (>= 3, < 4)
@@ -122,15 +122,15 @@ GEM
122122
simplecov-html (0.13.1)
123123
simplecov_json_formatter (0.1.4)
124124
simpleidn (0.2.3)
125-
sorbet (0.5.12109)
126-
sorbet-static (= 0.5.12109)
127-
sorbet-runtime (0.5.12109)
128-
sorbet-static (0.5.12109-aarch64-linux)
129-
sorbet-static (0.5.12109-universal-darwin)
130-
sorbet-static (0.5.12109-x86_64-linux)
131-
sorbet-static-and-runtime (0.5.12109)
132-
sorbet (= 0.5.12109)
133-
sorbet-runtime (= 0.5.12109)
125+
sorbet (0.5.12117)
126+
sorbet-static (= 0.5.12117)
127+
sorbet-runtime (0.5.12117)
128+
sorbet-static (0.5.12117-aarch64-linux)
129+
sorbet-static (0.5.12117-universal-darwin)
130+
sorbet-static (0.5.12117-x86_64-linux)
131+
sorbet-static-and-runtime (0.5.12117)
132+
sorbet (= 0.5.12117)
133+
sorbet-runtime (= 0.5.12117)
134134
spoom (1.6.3)
135135
erubi (>= 1.10.0)
136136
prism (>= 0.28.0)

Library/Homebrew/autobump_constants.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,7 @@
55
NO_AUTOBUMP_REASONS_LIST = T.let({
66
incompatible_version_format: "incompatible version format",
77
bumped_by_upstream: "bumped by upstream",
8+
extract_plist: "livecheck uses `:extract_plist` strategy",
9+
latest_version: "`version` is set to `:latest`",
10+
requires_manual_review: "a manual review of this package is required for inclusion in autobump",
811
}.freeze, T::Hash[Symbol, String])

0 commit comments

Comments
 (0)