Skip to content

Commit 8621e55

Browse files
Merge pull request #683 from Homebrew/sync-shared-config
2 parents 8c065d9 + 053cdc6 commit 8621e55

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.github/workflows/actionlint.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ on:
77
- main
88
- master
99
pull_request:
10-
merge_group:
1110

1211
defaults:
1312
run:
@@ -50,6 +49,8 @@ jobs:
5049

5150
- name: Upload SARIF file
5251
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
52+
# We can't use the SARIF file when triggered by `merge_group` so we don't upload it.
53+
if: always() && github.event_name != 'merge_group'
5354
with:
5455
name: results.sarif
5556
path: results.sarif
@@ -66,7 +67,8 @@ jobs:
6667
if: >
6768
always() &&
6869
!contains(fromJSON('["cancelled", "skipped"]'), needs.workflow_syntax.result) &&
69-
!github.event.repository.private
70+
!github.event.repository.private &&
71+
github.event_name != 'merge_group'
7072
runs-on: ubuntu-latest
7173
permissions:
7274
contents: read

.rubocop.yml

+4
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,17 @@ plugins:
77
plugin_class_name: RuboCop::Performance::Plugin
88
- rubocop-rspec:
99
plugin_class_name: RuboCop::RSpec::Plugin
10+
- rubocop-sorbet:
11+
plugin_class_name: RuboCop::Sorbet::Plugin
1012
AllCops:
13+
ParserEngine: parser_prism
1114
TargetRubyVersion: 3.3
1215
NewCops: enable
1316
Include:
1417
- "**/*.rbi"
1518
Exclude:
1619
- Homebrew/sorbet/rbi/{dsl,gems}/**/*.rbi
20+
- Homebrew/sorbet/rbi/parser*.rbi
1721
- Homebrew/bin/*
1822
- Homebrew/vendor/**/*
1923
- Taps/*/*/vendor/**/*

0 commit comments

Comments
 (0)