Browse Source

✅ Skip change alerts in CI test

Scott Lahteine 1 year ago
parent
commit
1771d7ab64
3 changed files with 12 additions and 6 deletions
  1. 8 4
      .editorconfig
  2. 1 1
      Makefile
  3. 3 1
      Marlin/src/inc/Changes.h

+ 8 - 4
.editorconfig

@@ -4,16 +4,20 @@ root = true
 [{*.patch,syntax_test_*}]
 trim_trailing_whitespace = false
 
-[{*.c,*.cpp,*.h,*.ino}]
-charset = utf-8
-
-[{*.c,*.cpp,*.h,*.ino,Makefile}]
+[{*.c,*.cpp,*.h,*.ino,*.py,Makefile}]
 trim_trailing_whitespace = true
 insert_final_newline = true
 end_of_line = lf
+
+[{*.c,*.cpp,*.h,*.ino}]
+charset = utf-8
 indent_style = space
 indent_size = 2
 
+[{Makefile}]
+indent_style = tab
+indent_size = 2
+
 [{*.py}]
 indent_style = space
 indent_size = 4

+ 1 - 1
Makefile

@@ -27,7 +27,7 @@ help:
 
 tests-single-ci:
 	export GIT_RESET_HARD=true
-	$(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET)
+	$(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET) PLATFORMIO_BUILD_FLAGS=-DGITHUB_ACTION
 .PHONY: tests-single-ci
 
 tests-single-local:

+ 3 - 1
Marlin/src/inc/Changes.h

@@ -30,7 +30,9 @@
 /**
  * Warnings for old configurations
  */
-#if WATCH_TEMP_PERIOD > 500
+#ifdef GITHUB_ACTION
+  // Skip change alerts during CI Test
+#elif WATCH_TEMP_PERIOD > 500
   #error "WATCH_TEMP_PERIOD now uses seconds instead of milliseconds."
 #elif DISABLED(THERMAL_PROTECTION_HOTENDS) && (defined(WATCH_TEMP_PERIOD) || defined(THERMAL_PROTECTION_PERIOD))
   #error "Thermal Runaway Protection for hotends is now enabled with THERMAL_PROTECTION_HOTENDS."