Skip to content

Commit

Permalink
✅ Skip change alerts in CI test
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Apr 26, 2023
1 parent 68f7478 commit 1771d7a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
12 changes: 8 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 3 additions & 1 deletion Marlin/src/inc/Changes.h
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down

0 comments on commit 1771d7a

Please sign in to comment.