Skip to content

Commit dd2b162

Browse files
authored
Merge pull request #966 from Homebrew/sync-shared-config
Synchronize shared configuration
2 parents 4247bcf + dda9fd6 commit dd2b162

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

.github/workflows/actionlint.yml

Lines changed: 5 additions & 3 deletions
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
@@ -79,7 +81,7 @@ jobs:
7981
path: results.sarif
8082

8183
- name: Upload SARIF file
82-
uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
84+
uses: github/codeql-action/upload-sarif@fc7e4a0fa01c3cca5fd6a1fddec5c0740c977aa2 # v3.28.14
8385
with:
8486
sarif_file: results.sarif
8587
category: zizmor

.rubocop.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
# This file is synced from `Homebrew/brew` by the `.github` repository, do not modify it directly.
22
---
3-
plugins:
4-
- rubocop-md:
5-
plugin_class_name: RuboCop::Markdown::Plugin
6-
- rubocop-performance:
7-
plugin_class_name: RuboCop::Performance::Plugin
8-
- rubocop-rspec:
9-
plugin_class_name: RuboCop::RSpec::Plugin
10-
- rubocop-sorbet:
11-
plugin_class_name: RuboCop::Sorbet::Plugin
123
AllCops:
134
ParserEngine: parser_prism
145
TargetRubyVersion: 3.3

0 commit comments

Comments
 (0)