Skip to content

Commit 630945e

Browse files
vitess-bot[bot]vitess-bot[bot]
committed
Cherry-pick 7484488 with conflicts
1 parent b8e5d61 commit 630945e

9 files changed

Lines changed: 61 additions & 3 deletions

‎.github/workflows/arewefastyet_comment.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: arewefastyet comment
44
permissions: read-all
55

66
on:
7-
pull_request_target:
7+
pull_request_target: # zizmor: ignore[dangerous-triggers] never checks out or runs PR code
88
types: [labeled]
99

1010
jobs:

‎.github/workflows/assign_milestone.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Assign Milestone
22

33
on:
4-
pull_request_target:
4+
pull_request_target: # zizmor: ignore[dangerous-triggers] only checks out the base ref, never PR code
55
types: [opened]
66

77
permissions:

‎.github/workflows/check_make_vtadmin_web_proto.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,13 @@ jobs:
6464

6565
- name: Setup Node
6666
if: steps.changes.outputs.proto_changes == 'true'
67+
<<<<<<< HEAD
6768
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
69+
||||||| parent of 74844882a2 (Add `zizmor` check to the static checks workflow (#19149))
70+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
71+
=======
72+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 # zizmor: ignore[cache-poisoning] this workflow publishes no artifacts
73+
>>>>>>> 74844882a2 (Add `zizmor` check to the static checks workflow (#19149))
6874
with:
6975
# node-version should match package.json
7076
node-version: '22.13.1'

‎.github/workflows/cluster_endtoend.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,28 @@ jobs:
182182
if: steps.changes.outputs.end_to_end == 'true' && contains(matrix.needs, 'minio')
183183
uses: ./.github/actions/setup-minio
184184

185+
<<<<<<< HEAD
186+
||||||| parent of 74844882a2 (Add `zizmor` check to the static checks workflow (#19149))
187+
# 'consul' is the only need that triggers `make tools`, which installs both Consul and ZooKeeper.
188+
# There is no separate 'zookeeper' need, so 'consul' is the correct proxy for "this shard needs ZooKeeper".
189+
- name: Cache ZooKeeper
190+
if: steps.changes.outputs.end_to_end == 'true' && contains(matrix.needs, 'consul')
191+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
192+
with:
193+
path: dist/vt-zookeeper-*
194+
key: zookeeper-${{ hashFiles('build.env', 'bootstrap.sh') }}
195+
196+
=======
197+
# 'consul' is the only need that triggers `make tools`, which installs both Consul and ZooKeeper.
198+
# There is no separate 'zookeeper' need, so 'consul' is the correct proxy for "this shard needs ZooKeeper".
199+
- name: Cache ZooKeeper
200+
if: steps.changes.outputs.end_to_end == 'true' && contains(matrix.needs, 'consul')
201+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 # zizmor: ignore[cache-poisoning] this workflow publishes no artifacts
202+
with:
203+
path: dist/vt-zookeeper-*
204+
key: zookeeper-${{ hashFiles('build.env', 'bootstrap.sh') }}
205+
206+
>>>>>>> 74844882a2 (Add `zizmor` check to the static checks workflow (#19149))
185207
- name: Install Consul and ZooKeeper
186208
if: steps.changes.outputs.end_to_end == 'true' && contains(matrix.needs, 'consul')
187209
run: make BUILD_PROTOC=0 tools

‎.github/workflows/pr_opened_tasks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ permissions:
77
contents: read
88

99
on:
10-
pull_request_target:
10+
pull_request_target: # zizmor: ignore[dangerous-triggers] only checks out the base ref, never PR code
1111
types: [opened]
1212

1313
jobs:

‎.github/workflows/static_checks_etc.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,13 @@ jobs:
222222
223223
- name: Setup Node
224224
if: steps.changes.outputs.proto_changes == 'true'
225+
<<<<<<< HEAD
225226
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
227+
||||||| parent of 74844882a2 (Add `zizmor` check to the static checks workflow (#19149))
228+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
229+
=======
230+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 # zizmor: ignore[cache-poisoning] this workflow publishes no artifacts
231+
>>>>>>> 74844882a2 (Add `zizmor` check to the static checks workflow (#19149))
226232
with:
227233
# make proto requires newer node than the pre-installed one
228234
node-version: '22.13.1'
@@ -251,3 +257,9 @@ jobs:
251257
echo "$output"
252258
echo ""
253259
exit 1
260+
261+
- name: Run zizmor 🌈
262+
uses: zizmorcore/zizmor-action@3dc1ecc9bcb9e94e9b2c709687979e1298497054 # v0.6.2
263+
with:
264+
advanced-security: false
265+
annotations: true

‎.github/workflows/vtadmin_web_build.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,13 @@ jobs:
4242
- name: Tune the OS
4343
uses: ./.github/actions/tune-os
4444

45+
<<<<<<< HEAD
4546
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
47+
||||||| parent of 74844882a2 (Add `zizmor` check to the static checks workflow (#19149))
48+
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
49+
=======
50+
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 # zizmor: ignore[cache-poisoning] this workflow publishes no artifacts
51+
>>>>>>> 74844882a2 (Add `zizmor` check to the static checks workflow (#19149))
4652
with:
4753
# node-version should match package.json
4854
node-version: '22.13.1'

‎.github/workflows/vtadmin_web_lint.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,13 @@ jobs:
4242
- name: Tune the OS
4343
uses: ./.github/actions/tune-os
4444

45+
<<<<<<< HEAD
4546
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
47+
||||||| parent of 74844882a2 (Add `zizmor` check to the static checks workflow (#19149))
48+
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
49+
=======
50+
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 # zizmor: ignore[cache-poisoning] this workflow publishes no artifacts
51+
>>>>>>> 74844882a2 (Add `zizmor` check to the static checks workflow (#19149))
4652
with:
4753
# node-version should match package.json
4854
node-version: '22.13.1'

‎.github/workflows/vtadmin_web_unit_tests.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,13 @@ jobs:
3737
- name: Tune the OS
3838
uses: ./.github/actions/tune-os
3939

40+
<<<<<<< HEAD
4041
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
42+
||||||| parent of 74844882a2 (Add `zizmor` check to the static checks workflow (#19149))
43+
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
44+
=======
45+
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 # zizmor: ignore[cache-poisoning] this workflow publishes no artifacts
46+
>>>>>>> 74844882a2 (Add `zizmor` check to the static checks workflow (#19149))
4147
with:
4248
# node-version should match package.json
4349
node-version: '22.13.1'

0 commit comments

Comments
 (0)