Merge remote-tracking branch 'upstream/master'

.github/workflows/auto_approve.yml

@@ -13,8 +13,8 @@ jobs:
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: mheap/automatic-approve-action@v1
+    - uses: zvecr/automatic-approve-action@safe_files
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}
-        workflows: "format.yml,lint.yml,unit_test.yml"
-        dangerous_files: "lib/python/,Makefile,paths.mk,builddefs/"
+        workflows: "labeler.yml,lint.yml,docs.yml"
+        safe_files: "keyboards/,docs/"

keyboards/dasky/reverb/graphics/display.c

@@ -9,6 +9,7 @@
 #include <math.h>
 
 static painter_image_handle_t reverb_logo;
+static painter_image_handle_t splash_image;
 static deferred_token         display_task_token;
 static uint32_t               key_pressed_count = 0;
 
@@ -32,7 +33,6 @@ void display_init_kb(void) {
     if (!display_init_user()) {
         return;
     }
-    painter_image_handle_t splash_image;
     splash_image = qp_load_image_mem(gfx_splash);
     reverb_logo  = qp_load_image_mem(gfx_reverb);
     qp_drawimage(reverb_display, 0, 0, splash_image);

lib/python/qmk/commands.py

@@ -101,6 +101,12 @@ def dump_lines(output_file, lines, quiet=True):
     if output_file and output_file.name != '-':
         output_file.parent.mkdir(parents=True, exist_ok=True)
         if output_file.exists():
+            with open(output_file, 'r', encoding='utf-8', newline='\n') as f:
+                existing = f.read()
+            if existing == generated:
+                if not quiet:
+                    cli.log.info(f'No changes to {output_file.name}.')
+                return
             output_file.replace(output_file.parent / (output_file.name + '.bak'))
         output_file.write_text(generated, encoding='utf-8')