Skip to content

Commit 864cbc9

Browse files
authored
Added instructions on what to do if your command images are regenerated (apache#24581)
In case there are conflicting changes to breeze command in several PRs, you might get conflicting images printed. in such case you should run `breeze regenerate-command-images`
1 parent d6cd528 commit 864cbc9

File tree

6 files changed

+134
-118
lines changed

6 files changed

+134
-118
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ repos:
341341
pass_filenames: true
342342
files: ^airflow/providers/.*\.py$
343343
additional_dependencies: ['rich>=12.4.4']
344-
- id: update-breeze-file
344+
- id: update-breeze-cmd-output
345345
name: Update output of breeze commands in BREEZE.rst
346346
entry: ./scripts/ci/pre_commit/pre_commit_breeze_cmd_line.py
347347
language: python

STATIC_CODE_CHECKS.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ require Breeze Docker image to be build locally.
294294
+--------------------------------------------------------+------------------------------------------------------------------+---------+
295295
| trailing-whitespace | Remove trailing whitespace at end of line | |
296296
+--------------------------------------------------------+------------------------------------------------------------------+---------+
297-
| update-breeze-file | Update output of breeze commands in BREEZE.rst | |
297+
| update-breeze-cmd-output | Update output of breeze commands in BREEZE.rst | |
298298
+--------------------------------------------------------+------------------------------------------------------------------+---------+
299299
| update-breeze-readme-config-hash | Update Breeze README.md with config files hash | |
300300
+--------------------------------------------------------+------------------------------------------------------------------+---------+

dev/breeze/src/airflow_breeze/pre_commit_ids.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
'run-shellcheck',
9595
'static-check-autoflake',
9696
'trailing-whitespace',
97-
'update-breeze-file',
97+
'update-breeze-cmd-output',
9898
'update-breeze-readme-config-hash',
9999
'update-extras',
100100
'update-in-the-wild-to-be-sorted',
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
8b4116c1808c84d491961283a4ddbec2
1+
2+
# This file is automatically generated by pre-commit. If you have a conflict with this file
3+
# Please do not solve it but run `breeze regenerate-command-images`.
4+
# This command should fix the conflict and regenerate help images that you have conflict with.
5+
82cd0f28c2c53f699a5b571275f8f674

0 commit comments

Comments
 (0)