Skip to content

Commit 52f4a4d

Browse files
authored
Merge pull request #783 from Homebrew/sync-shared-config
2 parents f582086 + a3d5cfe commit 52f4a4d

File tree

3 files changed

+20
-3
lines changed

3 files changed

+20
-3
lines changed

.github/codeql/extensions/homebrew-actions.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# This file is synced from the `.github` repository, do not modify it directly.
12
extensions:
23
- addsTo:
34
pack: codeql/actions-all

.github/workflows/actionlint.yml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,14 @@ on:
66
branches:
77
- main
88
- master
9+
paths:
10+
- '.github/workflows/*.ya?ml'
11+
- 'Formula/a/actionlint.rb'
12+
- 'Formula/s/shellcheck.rb'
13+
- 'Formula/z/zizmor.rb'
914
pull_request:
15+
paths:
16+
- '.github/workflows/*.ya?ml'
1017

1118
defaults:
1219
run:
@@ -32,7 +39,7 @@ jobs:
3239
steps:
3340
- name: Set up Homebrew
3441
id: setup-homebrew
35-
uses: Homebrew/actions/setup-homebrew@master
42+
uses: Homebrew/actions/setup-homebrew@main
3643
with:
3744
core: false
3845
cask: false
@@ -56,7 +63,15 @@ jobs:
5663
path: results.sarif
5764

5865
- name: Set up actionlint
59-
run: echo "::add-matcher::$(brew --repository)/.github/actionlint-matcher.json"
66+
run: |
67+
# In homebrew-core, setting `shell: /bin/bash` prevents shellcheck from running on
68+
# those steps, so let's change them to `shell: bash` temporarily for better linting.
69+
sed -i 's|shell: /bin/bash -x|shell: bash -x|' .github/workflows/*.y*ml
70+
71+
# In homebrew-core, the JSON matcher needs to be accessible to the container host.
72+
cp "$(brew --repository)/.github/actionlint-matcher.json" "$HOME"
73+
74+
echo "::add-matcher::$HOME/actionlint-matcher.json"
6075
6176
- run: actionlint
6277

@@ -81,7 +96,7 @@ jobs:
8196
path: results.sarif
8297

8398
- name: Upload SARIF file
84-
uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
99+
uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
85100
with:
86101
sarif_file: results.sarif
87102
category: zizmor

.github/zizmor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# This file is synced from the `.github` repository, do not modify it directly.
12
rules:
23
unpinned-uses:
34
config:

0 commit comments

Comments
 (0)